From 4eb931686eb56182f90b424cc3ff9d24c37d26cd Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 5 Dec 2023 14:57:34 +0800 Subject: [PATCH 001/169] =?UTF-8?q?=E9=B2=81=E6=8E=A7=E6=95=B0=E5=AD=97tem?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/bo/SalaryAcctResultReportBO.java | 39 ++++ .../salaryacct/bo/SalaryAcctResultBO.java | 29 +++ .../param/SalaryAcctResultBatchEditParam.java | 40 +++++ .../SalaryAcctResultBatchUpdateParam.java | 37 ++++ .../service/SalaryAcctRecordService.java | 6 + .../service/SalaryAcctResultService.java | 17 +- .../impl/SalaryAcctRecordServiceImpl.java | 99 +++++++++++ .../impl/SalaryAcctResultServiceImpl.java | 168 ++++++++++++++++++ .../salary/web/SalaryAcctController.java | 27 +++ .../wrapper/SalaryAcctRecordWrapper.java | 8 + .../wrapper/SalaryAcctResultWrapper.java | 21 ++- 11 files changed, 483 insertions(+), 8 deletions(-) create mode 100644 src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java create mode 100644 src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java diff --git a/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java b/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java index 6a23857a5..485389860 100644 --- a/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java +++ b/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java @@ -8,6 +8,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTempPO; import dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.math.NumberUtils; import java.util.*; @@ -62,6 +63,44 @@ public class SalaryAcctResultReportBO { .collect(Collectors.toList()); } + public static List lkszConvert2PO(List items, + SalaryAcctEmployeePO salaryAcctEmployee, + Long employeeId, Map emps) { + if (CollectionUtils.isEmpty(items) || ObjectUtils.isEmpty(salaryAcctEmployee)) { + return Collections.emptyList(); + } + Date now = new Date(); + return items.stream() + .map(e -> { + SalaryAcctResultReportPO po = SalaryAcctResultReportPO.builder() + .id(IdGenerator.generate()) + .salarySobId(salaryAcctEmployee.getSalarySobId()) + .salaryItemId(e.getSalaryItemId()) + .salaryAcctRecordId(salaryAcctEmployee.getSalaryAcctRecordId()) + .salaryAcctEmpId(salaryAcctEmployee.getId().toString()) + .employeeId(salaryAcctEmployee.getEmployeeId().toString()) + .taxAgentId(salaryAcctEmployee.getTaxAgentId()) + .resultValue(e.getResultValue()) + .creator(employeeId) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + + DataCollectionEmployee dataCollectionEmployee = emps.get(salaryAcctEmployee.getEmployeeId()); + if (dataCollectionEmployee != null) { + po.setDepartmentId(dataCollectionEmployee.getDepartmentId()); + po.setSubcompanyId(dataCollectionEmployee.getSubcompanyid()); + po.setCostcenterId(dataCollectionEmployee.getCostcenterId()); + po.setJobtitleId(dataCollectionEmployee.getJobtitleId()); + po.setLocationId(dataCollectionEmployee.getLocationId()); + } + return po; + }) + .collect(Collectors.toList()); + } + public static List convert2ReportPO(Collection temps, Map emps) { // Map longDataCollectionEmployeeMap = SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId); diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 57b6e1927..29cae5d4a 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -27,6 +27,7 @@ import com.engine.salary.util.page.Column; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.BeanUtils; @@ -577,6 +578,34 @@ public class SalaryAcctResultBO { .collect(Collectors.toList()); } + + public static List batchEditConvert2PO(Map salaryAcctResultOldPOMap, + List items, + SalaryAcctEmployeePO salaryAcctEmployee, + Long employeeId) { + if (CollectionUtils.isEmpty(items) || ObjectUtils.isEmpty(salaryAcctEmployee)) { + return Collections.emptyList(); + } + Date now = new Date(); + return items.stream() + .map(e -> SalaryAcctResultPO.builder() + .salarySobId(salaryAcctEmployee.getSalarySobId()) + .salaryItemId(e.getSalaryItemId()) + .salaryAcctRecordId(salaryAcctEmployee.getSalaryAcctRecordId()) + .salaryAcctEmpId(salaryAcctEmployee.getId()) + .employeeId(salaryAcctEmployee.getEmployeeId()) + .taxAgentId(salaryAcctEmployee.getTaxAgentId()) + .resultValue(StringUtils.trim(e.getResultValue())) + .originResultValue(salaryAcctResultOldPOMap.get(salaryAcctEmployee.getId() + "-" + e.getSalaryItemId())) + .creator(employeeId) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build()) + .collect(Collectors.toList()); + } + public static Map buildEmployeeFieldName() { Field[] declaredFields = SalaryFormulaEmployeeDTO.class.getDeclaredFields(); Map employeeFieldNameMap = Maps.newHashMapWithExpectedSize(declaredFields.length); diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java new file mode 100644 index 000000000..21922043c --- /dev/null +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java @@ -0,0 +1,40 @@ +package com.engine.salary.entity.salaryacct.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @ClassName SalaryAcctResultBatchUpdateParam + * @author Harryxzy + * @date 2023/12/4 13:48 + * @description 鲁控数字批量编辑参数 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class SalaryAcctResultBatchEditParam { + + private Long salaryAcctRecordId; + + private List resultValueList; + + + @Data + @Builder + @AllArgsConstructor + @NoArgsConstructor + public class resultValue { + + // 薪资核算人员id + private Long salaryAcctEmpId; + + // 薪资项目值 + private List items; + } + +} diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java new file mode 100644 index 000000000..8eabde532 --- /dev/null +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java @@ -0,0 +1,37 @@ +package com.engine.salary.entity.salaryacct.param; + +import com.engine.salary.util.valid.DataCheck; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @ClassName SalaryAcctResultBatchUpdateParam + * @author Harryxzy + * @date 2023/12/4 13:48 + * @description 鲁控数字批量更新参数 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class SalaryAcctResultBatchUpdateParam { + + //薪资核算记录的id + @DataCheck(require = true, message = "薪资核算记录ID不得为空") + private Long salaryAcctRecordId; + + //薪资项目的Id + @DataCheck(require = true, message = "薪资项目id不得为空") + private Long salaryItemId; + + // 薪资核算人员id + private List salaryAcctEmpIdList; + + //薪资项目值 + private String value; + +} diff --git a/src/com/engine/salary/service/SalaryAcctRecordService.java b/src/com/engine/salary/service/SalaryAcctRecordService.java index 1ba3419bf..319552b78 100644 --- a/src/com/engine/salary/service/SalaryAcctRecordService.java +++ b/src/com/engine/salary/service/SalaryAcctRecordService.java @@ -207,4 +207,10 @@ public interface SalaryAcctRecordService { List listSome(SalaryAcctRecordPO po); + + /** + * 鲁控数字-结账 + * @param salaryAcctRecordId + */ + void lkszJz(Long salaryAcctRecordId); } diff --git a/src/com/engine/salary/service/SalaryAcctResultService.java b/src/com/engine/salary/service/SalaryAcctResultService.java index 67320ed0d..871188360 100644 --- a/src/com/engine/salary/service/SalaryAcctResultService.java +++ b/src/com/engine/salary/service/SalaryAcctResultService.java @@ -4,10 +4,7 @@ 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.dto.SalaryAcctResultListColumnDTO; -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.param.SalaryAcctResultUpdateLockStatusParam; +import com.engine.salary.entity.salaryacct.param.*; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.util.page.PageInfo; @@ -207,4 +204,16 @@ public interface SalaryAcctResultService { * @return */ Boolean checkAuth(Long salaryAcctRecordId); + + /** + * 鲁控数字薪资核算结果批量更新 + * @param param + */ + void lkszBatchUpdate(SalaryAcctResultBatchUpdateParam param); + + /** + * 鲁控数字薪资核算结果批量编辑 + * @param param + */ + void lkszBatchEdit(SalaryAcctResultBatchEditParam param); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 8038d08f7..1a189f762 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -4,6 +4,9 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; import com.engine.salary.entity.salaryBill.po.SalarySendPO; import com.engine.salary.entity.salaryacct.bo.SalaryAcctRecordBO; import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam; @@ -12,6 +15,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; +import com.engine.salary.entity.salarysob.po.SalarySobItemPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; @@ -31,11 +35,14 @@ 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 dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import weaver.hrm.User; +import java.time.YearMonth; import java.util.*; import java.util.stream.Collectors; @@ -77,6 +84,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe return ServiceUtil.getService(SalarySysConfServiceImpl.class, user); } + private SalarySobItemService getSalarySobItemService(User user) { + return ServiceUtil.getService(SalarySobItemServiceImpl.class, user); + } + // private SalaryCheckResultService salaryCheckResultService; // // private SalaryCheckResultDetailService salaryCheckResultDetailService; @@ -102,6 +113,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe return ServiceUtil.getService(SalaryStatisticsReportServiceImpl.class, user); } + private SalaryEmployeeService getSalaryEmployeeService(User user) { + return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); + } + @Override public SalaryAcctRecordPO getById(Long id) { @@ -810,4 +825,88 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe public List listSome(SalaryAcctRecordPO po) { return getSalaryAcctRecordMapper().listSome(po); } + + @Override + public void lkszJz(Long salaryAcctRecordId) { + SalaryAcctRecordPO salaryAcctRecordPO = getById(salaryAcctRecordId); + if (ObjectUtils.isEmpty(salaryAcctRecordPO)) { + throw new SalaryRunTimeException("薪资核算记录不存在或已被删除"); + } + YearMonth salaryMonth = SalaryDateUtil.toYearMonth(SalaryDateUtil.dateToLocalDate(salaryAcctRecordPO.getSalaryMonth()).plusMonths(1)); + // 创建下一个月的薪资核算记录 + Long newSalaryAcctRecordId = save(SalaryAcctRecordSaveParam.builder().salarySobId(salaryAcctRecordPO.getSalarySobId()).salaryMonth(salaryMonth).build()); + // 查询下个月的薪资核算人员 + List salaryAcctEmployeePOList = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(newSalaryAcctRecordId); + List acctEmpIds = salaryAcctEmployeePOList.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList()); + // 获取原来的薪资核算结果 + List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); + List salarySobItemIds = salarySobItemPOS.stream().map(SalarySobItemPO::getSalaryItemId).collect(Collectors.toList()); + List resultPOS = getSalaryAcctResultService(user).listBySalaryAcctRecordIdsAndSalaryItemIds(Collections.singletonList(salaryAcctRecordId), salarySobItemIds); + // 过滤掉新的核算记录中不存在的人 + resultPOS = resultPOS.stream().filter(result -> acctEmpIds.contains(result.getEmployeeId())).collect(Collectors.toList()); + Map> resultMap = SalaryEntityUtil.group2Map(resultPOS, SalaryAcctResultPO::getEmployeeId); + // 查询人员信息，供报表使用 + List dataCollectionEmployees = getSalaryEmployeeService(user).listAllForReport(); + Map emps = SalaryEntityUtil.convert2Map(dataCollectionEmployees, DataCollectionEmployee::getEmployeeId); + + // 需要保存的核算结果 + List needInsertResultList = new ArrayList<>(); + // 报表 + List needInsertResultReportList = new ArrayList<>(); + Date now = new Date(); + Long uid = Long.valueOf(user.getUID()); + salaryAcctEmployeePOList.stream().forEach(acctEmp -> { + List oldResultList = resultMap.get(acctEmp.getEmployeeId()); + oldResultList.stream().forEach(oldResult -> { + // 薪资核算结果 + needInsertResultList.add(SalaryAcctResultPO.builder() + .salarySobId(salaryAcctRecordPO.getSalarySobId()) + .salaryItemId(oldResult.getSalaryItemId()) + .salaryAcctRecordId(newSalaryAcctRecordId) + .salaryAcctEmpId(acctEmp.getId()) + .employeeId(acctEmp.getEmployeeId()) + .taxAgentId(acctEmp.getTaxAgentId()) + .resultValue(StringUtils.trim(oldResult.getResultValue())) + .originResultValue(oldResult.getOriginResultValue()) + .creator(uid) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build()); + + // 报表结果 + SalaryAcctResultReportPO po = SalaryAcctResultReportPO.builder() + .id(IdGenerator.generate()) + .salarySobId(salaryAcctRecordPO.getSalarySobId()) + .salaryItemId(oldResult.getSalaryItemId()) + .salaryAcctRecordId(newSalaryAcctRecordId) + .salaryAcctEmpId(acctEmp.getId().toString()) + .employeeId(acctEmp.getEmployeeId().toString()) + .taxAgentId(acctEmp.getTaxAgentId()) + .resultValue(StringUtils.trim(oldResult.getResultValue())) + .creator(uid) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + + DataCollectionEmployee dataCollectionEmployee = emps.get(acctEmp.getEmployeeId()); + if (dataCollectionEmployee != null) { + po.setDepartmentId(dataCollectionEmployee.getDepartmentId()); + po.setSubcompanyId(dataCollectionEmployee.getSubcompanyid()); + po.setCostcenterId(dataCollectionEmployee.getCostcenterId()); + po.setJobtitleId(dataCollectionEmployee.getJobtitleId()); + po.setLocationId(dataCollectionEmployee.getLocationId()); + } + needInsertResultReportList.add(po); + }); + }); + + // 入库 + getSalaryAcctResultService(user).batchSave(needInsertResultList); + getSalaryAcctReportService(user).batchSave(needInsertResultReportList); + + } } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 039546c4d..734f2ade4 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -4,6 +4,7 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.cache.SalaryCacheKey; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO; @@ -46,6 +47,7 @@ import com.engine.salary.util.SalaryI18nUtil; 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.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -55,6 +57,7 @@ import com.weaver.util.threadPool.entity.LocalRunnable; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.jdbc.datasource.DataSourceTransactionManager; @@ -1088,4 +1091,169 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } return true; } + + @Override + public void lkszBatchUpdate(SalaryAcctResultBatchUpdateParam param) { + ValidUtil.doValidator(param); + + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId()); + if (ObjectUtils.isEmpty(salaryAcctRecordPO)) { + throw new SalaryRunTimeException("薪资核算记录不存在，或已被删除"); + } + List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); + // 薪资账套中包含的薪资项目 + List salarySobItemIds = salarySobItemPOS.stream().map(SalarySobItemPO::getSalaryItemId).collect(Collectors.toList()); + if (!salarySobItemIds.contains(param.getSalaryItemId())) { + throw new SalaryRunTimeException("该账套不包含该薪资项目或已被删除，请先检查账套"); + } + // 获取需要更新的核算人员信息 + List salaryAcctEmployeePOList = Collections.emptyList(); + if (CollectionUtils.isEmpty(param.getSalaryAcctEmpIdList())) { + // 没有选择核算人员，更新核算记录中所有人员 + salaryAcctEmployeePOList.addAll(getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salaryAcctRecordPO.getId())); + } else { + salaryAcctEmployeePOList.addAll(getSalaryAcctEmployeeService(user).listByIds(param.getSalaryAcctEmpIdList())); + } + + if (CollectionUtils.isNotEmpty(salaryAcctEmployeePOList)) { + List salaryAcctEmployeeIdList = SalaryEntityUtil.properties(salaryAcctEmployeePOList, SalaryAcctEmployeePO::getId, Collectors.toList()); + // 查询薪资核算结果 + List resultPOS = listByAcctEmployeeIdsAndSalaryItemIds(salaryAcctEmployeeIdList, Collections.singleton(param.getSalaryItemId())); + Map salaryAcctResultPOMap = SalaryEntityUtil.convert2Map(resultPOS, SalaryAcctResultPO::getSalaryAcctEmpId); + List needUpdateList = new ArrayList<>(); + List needInsertList = new ArrayList<>(); + Date now = new Date(); + salaryAcctEmployeePOList.forEach(salaryAcctEmployeePO -> { + if (salaryAcctResultPOMap.containsKey(salaryAcctEmployeePO.getId())) { + // 更新 + SalaryAcctResultPO po = salaryAcctResultPOMap.get(salaryAcctEmployeePO.getId()); + po.setResultValue(param.getValue()); + po.setUpdateTime(now); + needUpdateList.add(po); + } else { + // 新增 + needInsertList.add(SalaryAcctResultPO.builder() + .salarySobId(salaryAcctRecordPO.getSalarySobId()) + .salaryItemId(param.getSalaryItemId()) + .salaryAcctRecordId(param.getSalaryAcctRecordId()) + .salaryAcctEmpId(salaryAcctEmployeePO.getId()) + .employeeId(salaryAcctEmployeePO.getEmployeeId()) + .taxAgentId(salaryAcctEmployeePO.getTaxAgentId()) + .resultValue(StringUtils.trim(param.getValue())) + .originResultValue("") + .creator(Long.valueOf(user.getUID())) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build()); + } + }); + // 入库 + if (CollectionUtils.isNotEmpty(needUpdateList)) { + getSalaryAcctResultMapper().batchUpdate(needUpdateList); + } + + if (CollectionUtils.isNotEmpty(needInsertList)) { + getSalaryAcctResultMapper().batchInsert(needInsertList); + } + } + } + + @Override + public void lkszBatchEdit(SalaryAcctResultBatchEditParam param) { + List dataCollectionEmployees = getSalaryEmployeeService(user).listAllForReport(); + Map emps = SalaryEntityUtil.convert2Map(dataCollectionEmployees, DataCollectionEmployee::getEmployeeId); + + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId()); + if (ObjectUtils.isEmpty(salaryAcctRecordPO)) { + throw new SalaryRunTimeException("薪资核算结果不存在或已被删除"); + } + + List salaryAcctEmployeePOList = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(param.getSalaryAcctRecordId()); + Map salaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(salaryAcctEmployeePOList, SalaryAcctEmployeePO::getId); + + // 需要更新数据的薪资核算人员id + List updateAcctEmpIds = param.getResultValueList().stream().map(SalaryAcctResultBatchEditParam.resultValue::getSalaryAcctEmpId).collect(Collectors.toList()); + // 查询原来的薪资核算结果 + List salaryAcctResultPOSOld = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpIds(updateAcctEmpIds).build()); + // 解密 + encryptUtil.decryptList(salaryAcctResultPOSOld, SalaryAcctResultPO.class); + // 保存参数转换成薪资核算结果po + List salaryAcctResultPOS = new ArrayList<>(); + // 获取薪资项目回算前的值 + Map salaryAcctResultOldPOMap = salaryAcctResultPOSOld.stream() + .collect(Collectors.groupingBy(p -> p.getSalaryAcctEmpId() + "-" + p.getSalaryItemId(), + Collectors.collectingAndThen(Collectors.maxBy(Comparator.comparing(SalaryAcctResultPO::getId)), + s -> s.map(SalaryAcctResultPO::getOriginResultValue).orElse("")))); + List salaryAcctResultReportPOS = new ArrayList<>(); + param.getResultValueList().forEach(resultValue -> { + SalaryAcctEmployeePO salaryAcctEmployeePO = salaryAcctEmployeePOMap.get(resultValue.getSalaryAcctEmpId()); + salaryAcctResultPOS.addAll(SalaryAcctResultBO.batchEditConvert2PO(salaryAcctResultOldPOMap, resultValue.getItems(), salaryAcctEmployeePO, (long) user.getUID())); + // 报表 + salaryAcctResultReportPOS.addAll(SalaryAcctResultReportBO.lkszConvert2PO(resultValue.getItems(), salaryAcctEmployeePO, (long) user.getUID(), emps)); + }); + + // 删除原来的薪资核算结果 + param.getResultValueList().stream().forEach(resultValue -> { + List saveItemIds = resultValue.getItems().stream().map(SalaryAcctResultSaveParam.SalaryAcctResultDetailItemParam::getSalaryItemId).collect(Collectors.toList()); + deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getSalaryAcctEmpId()), saveItemIds); + // 报表 + getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getSalaryAcctEmpId()), saveItemIds); + }); + + // 保存薪资核算结果 + if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { + // 加密 + encryptUtil.encryptList(salaryAcctResultPOS, SalaryAcctResultPO.class); + List> partition = Lists.partition(salaryAcctResultPOS, 100); + partition.forEach(getSalaryAcctResultMapper()::batchInsert); + } + + //报表 + if (CollectionUtils.isNotEmpty(salaryAcctResultReportPOS)) { + getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); + } + } + + + public void temp(SalaryAcctResultSaveParam saveParam){ + List dataCollectionEmployees = getSalaryEmployeeService(user).listAllForReport(); + Map emps = SalaryEntityUtil.convert2Map(dataCollectionEmployees, DataCollectionEmployee::getEmployeeId); + + // 查询薪资核算人员 + SalaryAcctEmployeePO salaryAcctEmployeePO = getSalaryAcctEmployeeService(user).getById(saveParam.getSalaryAcctEmpId()); + if (Objects.isNull(salaryAcctEmployeePO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "薪资核算人员不存在或已被删除")); + } + // 查询原来的薪资核算结果 + List salaryAcctResultPOSOld = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpId(saveParam.getSalaryAcctEmpId()).build()); + // 解密 + encryptUtil.decryptList(salaryAcctResultPOSOld, SalaryAcctResultPO.class); + // 保存参数转换成薪资核算结果po + List salaryAcctResultPOS = SalaryAcctResultBO.convert2PO(salaryAcctResultPOSOld, saveParam, salaryAcctEmployeePO, (long) user.getUID()); + SalarySysConfPO autoLock = getSalarySysConfService(user).getOneByCode(SalarySysConstant.EDIT_IMPORT_AUTO_LOCK); + + // 删除原来的薪资核算结果 + List saveItemIds = saveParam.getItems().stream().map(SalaryAcctResultSaveParam.SalaryAcctResultDetailItemParam::getSalaryItemId).collect(Collectors.toList()); + deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(saveParam.getSalaryAcctEmpId()), saveItemIds); + // 保存薪资核算结果 + if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { + // 加密 + encryptUtil.encryptList(salaryAcctResultPOS, SalaryAcctResultPO.class); + List> partition = Lists.partition(salaryAcctResultPOS, 100); + partition.forEach(getSalaryAcctResultMapper()::batchInsert); + } + //报表 todo + getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(saveParam.getSalaryAcctEmpId()), saveItemIds); + List salaryAcctResultReportPOS = SalaryAcctResultReportBO.convert2PO(saveParam, salaryAcctEmployeePO, (long) user.getUID(), emps); + if (CollectionUtils.isNotEmpty(salaryAcctResultReportPOS)) { + getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); + } + + + // 存储薪资核算结果数据来源日志 + salaryAcctResultPOS = getSalaryAcctRecordService(user).listBySalaryAcctEmpId(saveParam.getSalaryAcctEmpId()); + saveSalaryAcctResultLog(salaryAcctResultPOSOld, salaryAcctResultPOS); + } } \ No newline at end of file diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 078060a02..45de6654d 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -158,6 +158,15 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); return new ResponseResult(user).run(getSalaryAcctRecordWrapper(user)::backCalculate, param.getSalaryAcctRecordId()); } + + // 结账 + @GET + @Path("/lkszJz") + @Produces(MediaType.APPLICATION_JSON) + public String lkszJz(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getSalaryAcctRecordWrapper(user)::lkszJz, id); + } /* ********************************薪资核算记录相关 end*********************************/ @@ -448,6 +457,24 @@ public class SalaryAcctController { return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::updateLockStatusByParam, param); } + //鲁控数字批量更新 + @POST + @Path("/acctresult/lkszBatchUpdate") + @Produces(MediaType.APPLICATION_JSON) + public String lkszBatchUpdate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctResultBatchUpdateParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::lkszBatchUpdate, param); + } + + //鲁控数字批量编辑 + @POST + @Path("/acctresult/lkszBatchEdit") + @Produces(MediaType.APPLICATION_JSON) + public String lkszBatchEdit(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctResultBatchEditParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::lkszBatchEdit, param); + } + //薪资核算 @POST @Path("/acctresult/accounting") diff --git a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java index 9c17eaf78..5cd43cecb 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java @@ -258,4 +258,12 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord public void backCalculate(Long salaryAcctRecordId){ getSalaryAcctRecordService(user).backCalculate(salaryAcctRecordId); } + + /** + * 鲁控数字-结账 + * @param salaryAcctRecordId + */ + public void lkszJz(Long salaryAcctRecordId) { + getSalaryAcctRecordService(user).lkszJz(salaryAcctRecordId); + } } diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index 8c0e6404d..59bbd3093 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -9,10 +9,7 @@ import com.engine.salary.entity.progress.ProgressDTO; import com.engine.salary.entity.salaryacct.dto.ConsolidatedTaxDetailDTO; import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultDetailDTO; import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultListColumnDTO; -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.param.SalaryAcctResultUpdateLockStatusParam; +import com.engine.salary.entity.salaryacct.param.*; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.*; @@ -260,6 +257,22 @@ public class SalaryAcctResultWrapper extends Service { return getSalaryAcctResultService(user).checkAuth(salaryAcctRecordId); } + /** + * 鲁控数字薪资核算结果批量更新 + * @param param + */ + public void lkszBatchUpdate(SalaryAcctResultBatchUpdateParam param) { + getSalaryAcctResultService(user).lkszBatchUpdate(param); + } + + /** + * 鲁控数字薪资核算结果批量编辑 + * @param param + */ + public void lkszBatchEdit(SalaryAcctResultBatchEditParam param) { + getSalaryAcctResultService(user).lkszBatchEdit(param); + } + /** * 薪资核算-校验 From 451c9fb07bc45cc2e026c1fafde520251b598c68 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 6 Dec 2023 09:51:07 +0800 Subject: [PATCH 002/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=E6=94=B9?= =?UTF-8?q?=E9=80=A0=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=BA=94=E7=94=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E7=9A=84=E5=8C=BA=E5=88=86=E5=BC=80=E5=85=B3?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E5=AE=9A=E5=90=8E=E5=B0=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=9A=84=E7=A6=8F=E5=88=A9=E5=9F=BA=E6=95=B0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=8C=BA=E5=88=86=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 68 ++++++++++++++++--- .../po/InsuranceAccountDetailPO.java | 18 +++++ .../dto/InsuranceArchivesFundSchemeDTO.java | 2 + .../dto/InsuranceArchivesOtherSchemeDTO.java | 2 + .../dto/InsuranceArchivesSocialSchemeDTO.java | 3 + .../po/InsuranceArchivesFundSchemePO.java | 7 ++ .../po/InsuranceArchivesOtherSchemePO.java | 6 ++ .../po/InsuranceArchivesSocialSchemePO.java | 6 ++ .../sys/constant/SalarySysConstant.java | 5 ++ .../impl/SalarySysConfServiceImpl.java | 12 ++++ 10 files changed, 119 insertions(+), 10 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 528849995..e0ebc3bef 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -14,7 +14,6 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBO; @@ -37,6 +36,10 @@ import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.SalaryEmployeeService; import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; +import com.engine.salary.sys.entity.po.SalarySysConfPO; +import com.engine.salary.sys.enums.OpenEnum; +import com.engine.salary.sys.service.SalarySysConfService; +import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryFormItemUtil; @@ -65,6 +68,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import static com.engine.salary.sys.constant.SalarySysConstant.WEL_BASE_DIFF_BY_PER_AND_COM; + /** * @Author weaver_cl @@ -113,6 +118,10 @@ public class SIArchivesBiz { return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); } + private SalarySysConfService getSalarySysConfService(User user) { + return ServiceUtil.getService(SalarySysConfServiceImpl.class, user); + } + /** * @param welfareType * @param employeeId @@ -266,15 +275,18 @@ public class SIArchivesBiz { */ public Map getPaymentForm(User user, WelfareTypeEnum welfareType, Long employeeId, long operateId, Long schemeId, Long paymentOrganization) { Map data = new HashMap<>(16); + //判断是否要区分个人和单位福利基数 + SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); + boolean welBaseDiffSign = welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); switch (welfareType) { case SOCIAL_SECURITY: - data = buildSocialPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization); + data = buildSocialPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign); break; case ACCUMULATION_FUND: - data = buildFundPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization); + data = buildFundPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign); break; case OTHER: - data = buildOtherPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization); + data = buildOtherPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign); break; default: } @@ -289,12 +301,16 @@ public class SIArchivesBiz { * @param operateId * @return */ - public Map buildOtherPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization) { + public Map buildOtherPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign) { Map dataMap = new HashMap<>(); InsuranceArchivesOtherSchemeDTO data = buildOtherForm(employeeId, operateId, paymentOrganization); if (data != null) { dataMap.put("data", JSONObject.parseObject(data.getOtherPaymentBaseString(), new TypeReference>() { })); + if (welBaseDiffSign) { + dataMap.put("comData", JSONObject.parseObject(data.getOtherPaymentComBaseString(), new TypeReference>() { + })); + } } List addGroups = new ArrayList<>(); List inputItems = buildPaymentBase(user, schemeId, welfareType); @@ -311,13 +327,17 @@ public class SIArchivesBiz { * @param operateId * @return */ - public Map buildFundPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization) { + public Map buildFundPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign) { Map dataMap = new HashMap<>(); InsuranceArchivesFundSchemeDTO data = buildFundForm(employeeId, operateId, paymentOrganization); if (data != null) { dataMap.put("data", JSONObject.parseObject(data.getFundPaymentBaseString(), new TypeReference>() { })); + if (welBaseDiffSign) { + dataMap.put("comData", JSONObject.parseObject(data.getFundPaymentComBaseString(), new TypeReference>() { + })); + } } List addGroups = new ArrayList<>(); List inputItems = buildPaymentBase(user, schemeId, welfareType); @@ -334,18 +354,28 @@ public class SIArchivesBiz { * @param operateId * @return */ - public Map buildSocialPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization) { + public Map buildSocialPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign) { Map dataMap = new HashMap<>(); InsuranceArchivesSocialSchemeDTO data = buildSocialForm(employeeId, operateId, paymentOrganization); if (data != null) { dataMap.put("data", JSONObject.parseObject(data.getSchemePaymentBaseString(), new TypeReference>() { })); + if (welBaseDiffSign) { + dataMap.put("comData", JSONObject.parseObject(data.getSchemePaymentComBaseString(), new TypeReference>() { + })); + } } List addGroups = new ArrayList<>(); List inputItems = buildPaymentBase(user, schemeId, welfareType); addGroups.add(new SearchConditionGroup("社保缴纳基数", true, inputItems)); dataMap.put("items", addGroups); + if (welBaseDiffSign) { + List addComGroups = new ArrayList<>(); + List inputComItems = buildPaymentComBase(user, schemeId, welfareType); + addComGroups.add(new SearchConditionGroup("社保缴纳基数", true, inputComItems)); + dataMap.put("comItems", addComGroups); + } return dataMap; } @@ -361,9 +391,27 @@ public class SIArchivesBiz { if (schemeId == null) { return new ArrayList<>(); } - List list = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream().collect(Collectors.collectingAndThen( - Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(InsuranceSchemeDetailPO::getInsuranceId))), ArrayList::new) - ); + List list = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() + .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_PERSON.getValue())).collect(Collectors.toList()); + SICategoryBiz siCategoryBiz = new SICategoryBiz(); + list.forEach(insuranceSchemeDetail -> { + ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); + if (iCategoryPO != null) { +// inputItems.add(SalaryFormItemUtil.inputNumberItem(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()))); + inputItems.add(SalaryFormItemUtil.inputNumberItemWithMaxAndMin(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()) + , insuranceSchemeDetail.getUpperLimit(), insuranceSchemeDetail.getLowerLimit())); + } + }); + return inputItems; + } + + public List buildPaymentComBase(User user, Long schemeId, Integer welfareType) { + List inputItems = new ArrayList<>(); + if (schemeId == null) { + return new ArrayList<>(); + } + List list = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() + .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_COMPANY.getValue())).collect(Collectors.toList()); SICategoryBiz siCategoryBiz = new SICategoryBiz(); list.forEach(insuranceSchemeDetail -> { ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java index e8f7ce98f..9cd2ad7f0 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java @@ -106,6 +106,12 @@ public class InsuranceAccountDetailPO { @Encrypt private String socialPaymentBaseString; + /** + * 社保缴纳基数——单位 + */ + @Encrypt + private String socialPaymentComBaseString; + /** * 公积金方案ID */ @@ -117,6 +123,12 @@ public class InsuranceAccountDetailPO { @Encrypt private String fundPaymentBaseString; + /** + * 公积金缴纳基数——单位 + */ + @Encrypt + private String fundPaymentComBaseString; + /** * 其他福利方案id */ @@ -128,6 +140,12 @@ public class InsuranceAccountDetailPO { @Encrypt private String otherPaymentBaseString; + /** + * 其他福利缴纳基数——单位 + */ + @Encrypt + private String otherPaymentComBaseString; + /** * 社保个人缴费明细 */ diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesFundSchemeDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesFundSchemeDTO.java index f85206c01..4fcfdbcd1 100644 --- a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesFundSchemeDTO.java +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesFundSchemeDTO.java @@ -65,4 +65,6 @@ public class InsuranceArchivesFundSchemeDTO { //缴纳基数 private String fundPaymentBaseString; + + private String fundPaymentComBaseString; } diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesOtherSchemeDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesOtherSchemeDTO.java index a3c55fee5..3fa89c1c2 100644 --- a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesOtherSchemeDTO.java +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesOtherSchemeDTO.java @@ -56,5 +56,7 @@ public class InsuranceArchivesOtherSchemeDTO { private String otherPaymentBaseString; + private String otherPaymentComBaseString; + //private WeaForm otherPaymentBase; } diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java index 1be1afbca..d4fc1dae8 100644 --- a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java @@ -59,4 +59,7 @@ public class InsuranceArchivesSocialSchemeDTO { //社保缴纳基数 private String schemePaymentBaseString; + //社保缴纳基数——单位 + private String schemePaymentComBaseString; + } diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java index 7b333f4e6..fc171c94b 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java @@ -87,6 +87,13 @@ public class InsuranceArchivesFundSchemePO { @Encrypt private String fundPaymentBaseString; + /** + * 公积金缴纳基数——单位 + */ + @Encrypt + private String fundPaymentComBaseString; + + /** * 租户key */ diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java index 76146719d..9ad9d9668 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java @@ -77,6 +77,12 @@ public class InsuranceArchivesOtherSchemePO { @Encrypt private String otherPaymentBaseString; + /** + * 其他福利缴纳基数——单位 + */ + @Encrypt + private String otherPaymentComBaseString; + /** * 租户key */ diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java index e6f4ff038..645e5215b 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java @@ -83,6 +83,12 @@ public class InsuranceArchivesSocialSchemePO { @Encrypt private String socialPaymentBaseString; + /** + * 社保缴纳基数——单位 + */ + @Encrypt + private String socialPaymentComBaseString; + /** * 租户key */ diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index c5b6b08db..df5ea5ea2 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -105,4 +105,9 @@ public class SalarySysConstant { * 核算固定列头数 */ public static final String SALARY_ACCT_FIXED_COLUMNS = "salaryAcctFixedColumns"; + + /** + * 应用设置是否福利档案基数区分个人和单位 + */ + public static final String WEL_BASE_DIFF_BY_PER_AND_COM = "welBaseDiffByPerAndCom"; } diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 57fb34878..74ead2a26 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -755,8 +755,10 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe insuranceArchivesSocialSchemePos.forEach(po -> { if (OpenEnum.OFF.getValue().equals(isOpenEncrypt)) { po.setSocialPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getSocialPaymentBaseString(), sysConfPo)); + po.setSocialPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getSocialPaymentComBaseString(), sysConfPo)); } else { po.setSocialPaymentBaseString(AESEncryptUtil.encrypt(po.getSocialPaymentBaseString())); + po.setSocialPaymentComBaseString(AESEncryptUtil.encrypt(po.getSocialPaymentComBaseString())); } }); List> partition = Lists.partition(insuranceArchivesSocialSchemePos, 50); @@ -782,8 +784,10 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe insuranceArchivesFundSchemePos.forEach(po -> { if (OpenEnum.OFF.getValue().equals(isOpenEncrypt)) { po.setFundPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getFundPaymentBaseString(), sysConfPo)); + po.setFundPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getFundPaymentComBaseString(), sysConfPo)); } else { po.setFundPaymentBaseString(AESEncryptUtil.encrypt(po.getFundPaymentBaseString())); + po.setFundPaymentComBaseString(AESEncryptUtil.encrypt(po.getFundPaymentComBaseString())); } }); List> partition = Lists.partition(insuranceArchivesFundSchemePos, 50); @@ -809,8 +813,10 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe insuranceArchivesOtherSchemePos.forEach(po -> { if (OpenEnum.OFF.getValue().equals(isOpenEncrypt)) { po.setOtherPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getOtherPaymentBaseString(), sysConfPo)); + po.setOtherPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getOtherPaymentComBaseString(), sysConfPo)); } else { po.setOtherPaymentBaseString(AESEncryptUtil.encrypt(po.getOtherPaymentBaseString())); + po.setOtherPaymentComBaseString(AESEncryptUtil.encrypt(po.getOtherPaymentComBaseString())); } }); List> partition = Lists.partition(insuranceArchivesOtherSchemePos, 50); @@ -869,6 +875,9 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe po.setSocialPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getSocialPaymentBaseString(), sysConfPo)); po.setFundPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getFundPaymentBaseString(), sysConfPo)); po.setOtherPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getOtherPaymentBaseString(), sysConfPo)); + po.setSocialPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getSocialPaymentComBaseString(), sysConfPo)); + po.setFundPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getFundPaymentComBaseString(), sysConfPo)); + po.setOtherPaymentComBaseString(AESEncryptUtil.closeEncryptSetting(po.getOtherPaymentComBaseString(), sysConfPo)); po.setSocialPerJson(AESEncryptUtil.closeEncryptSetting(po.getSocialPerJson(), sysConfPo)); po.setSocialPerSum(AESEncryptUtil.closeEncryptSetting(po.getSocialPerSum(), sysConfPo)); po.setFundPerJson(AESEncryptUtil.closeEncryptSetting(po.getFundPerJson(), sysConfPo)); @@ -887,6 +896,9 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe po.setSocialPaymentBaseString(AESEncryptUtil.encrypt(po.getSocialPaymentBaseString())); po.setFundPaymentBaseString(AESEncryptUtil.encrypt(po.getFundPaymentBaseString())); po.setOtherPaymentBaseString(AESEncryptUtil.encrypt(po.getOtherPaymentBaseString())); + po.setSocialPaymentComBaseString(AESEncryptUtil.encrypt(po.getSocialPaymentComBaseString())); + po.setFundPaymentComBaseString(AESEncryptUtil.encrypt(po.getFundPaymentComBaseString())); + po.setOtherPaymentComBaseString(AESEncryptUtil.encrypt(po.getOtherPaymentComBaseString())); po.setSocialPerJson(AESEncryptUtil.encrypt(po.getSocialPerJson())); po.setSocialPerSum(AESEncryptUtil.encrypt(po.getSocialPerSum())); po.setFundPerJson(AESEncryptUtil.encrypt(po.getFundPerJson())); From ec8cb6214ddb4b6f4a758b9f71c5750ab1bdabe8 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 6 Dec 2023 14:04:12 +0800 Subject: [PATCH 003/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=94=B9=E9=80=A0=EF=BC=8C=E9=80=82=E9=85=8D=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=E7=A6=8F=E5=88=A9=E5=9F=BA=E6=95=B0?= =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 163 ++++++++++++++++-- .../dto/InsuranceArchivesBaseHistoryDTO.java | 6 + .../param/InsuranceArchivesSaveParam.java | 2 + .../po/InsuranceArchivesBaseHistoryPO.java | 2 + .../mapper/siarchives/FundSchemeMapper.xml | 5 + .../mapper/siarchives/OtherSchemeMapper.xml | 9 +- .../mapper/siarchives/SocialSchemeMapper.xml | 5 + .../service/impl/SIArchivesServiceImpl.java | 2 +- .../service/impl/SISchemeServiceImpl.java | 6 +- 9 files changed, 175 insertions(+), 25 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index e0ebc3bef..a58021031 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -669,17 +669,20 @@ public class SIArchivesBiz { * @param param * @param employeeId */ - public void insert(InsuranceArchivesSaveParam param, long employeeId) { + public void insert(InsuranceArchivesSaveParam param, User user) { SalaryAssert.notNull(param.getWelfareType(), "福利类型为空"); + //判断是否要区分个人和单位福利基数 + SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); + boolean welBaseDiffSign = welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); switch (param.getWelfareType()) { case SOCIAL_SECURITY: - socialSave(param, employeeId); + socialSave(param, user, welBaseDiffSign); break; case ACCUMULATION_FUND: - fundSave(param, employeeId); + fundSave(param, user, welBaseDiffSign); break; case OTHER: - otherSave(param, employeeId); + otherSave(param, user, welBaseDiffSign); break; default: throw new SalaryRunTimeException("福利类型不存在"); @@ -691,7 +694,8 @@ public class SIArchivesBiz { * @param paramReq * @param employeeId */ - public void otherSave(InsuranceArchivesSaveParam paramReq, long employeeId) { + public void otherSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { + long employeeId = user.getUID(); SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); @@ -714,6 +718,7 @@ public class SIArchivesBiz { InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() .adjustAfterSchemeId(param.getOtherSchemeId()) .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) .welfareType(paramReq.getWelfareType().getValue()) .employeeId(param.getEmployeeId()) .paymentOrganization(param.getPaymentOrganization()) @@ -725,6 +730,7 @@ public class SIArchivesBiz { encryptUtil.decrypt(oldOtherInfo, InsuranceArchivesOtherSchemePO.class); adjustInfo.setAdjustBeforeBaseJson(oldOtherInfo.getOtherPaymentBaseString()); adjustInfo.setAdjustBeforeSchemeId(oldOtherInfo.getOtherSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldOtherInfo.getOtherPaymentComBaseString()); //新数据 InsuranceArchivesOtherSchemePO updateOtherInfo = InsuranceArchivesOtherSchemePO.builder() @@ -744,9 +750,17 @@ public class SIArchivesBiz { .otherPaymentBaseString(paramReq.getPaymentForm()) .build(); //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString())) { + if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { throw new SalaryRunTimeException("其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException("其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); + } + } encryptUtil.encrypt(updateOtherInfo, InsuranceArchivesOtherSchemePO.class); otherSchemeMapper.updateById(updateOtherInfo); //更新base_info表状态 @@ -780,9 +794,17 @@ public class SIArchivesBiz { .otherPaymentBaseString(paramReq.getPaymentForm()) .build(); //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentBaseString())) { + if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { throw new SalaryRunTimeException("其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException("其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); + } + } encryptUtil.encrypt(insertOtherInfo, InsuranceArchivesOtherSchemePO.class); otherSchemeMapper.insert(insertOtherInfo); sqlSession.commit(); @@ -818,7 +840,8 @@ public class SIArchivesBiz { * @param paramReq * @param employeeId */ - public void fundSave(InsuranceArchivesSaveParam paramReq, long employeeId) { + public void fundSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { + long employeeId = user.getUID(); SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); @@ -840,6 +863,7 @@ public class SIArchivesBiz { InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() .adjustAfterSchemeId(param.getFundSchemeId()) .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) .welfareType(paramReq.getWelfareType().getValue()) .employeeId(param.getEmployeeId()) .paymentOrganization(param.getPaymentOrganization()) @@ -851,6 +875,7 @@ public class SIArchivesBiz { encryptUtil.decrypt(oldFundInfo, InsuranceArchivesFundSchemePO.class); adjustInfo.setAdjustBeforeBaseJson(oldFundInfo.getFundPaymentBaseString()); adjustInfo.setAdjustBeforeSchemeId(oldFundInfo.getFundSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldFundInfo.getFundPaymentComBaseString()); //新数据 InsuranceArchivesFundSchemePO updateFundInfo = InsuranceArchivesFundSchemePO.builder() .id(oldFundInfo.getId()) @@ -871,9 +896,17 @@ public class SIArchivesBiz { .employeeId(param.getEmployeeId()) .build(); //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString())) { + if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { throw new SalaryRunTimeException("公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException("公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); + } + } encryptUtil.encrypt(updateFundInfo, InsuranceArchivesFundSchemePO.class); fundSchemeMapper.updateById(updateFundInfo); //更新base_info表状态 @@ -909,9 +942,17 @@ public class SIArchivesBiz { .employeeId(param.getEmployeeId()) .build(); //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentBaseString())) { + if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { throw new SalaryRunTimeException("公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException("公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); + } + } encryptUtil.encrypt(insertFundInfo, InsuranceArchivesFundSchemePO.class); fundSchemeMapper.insert(insertFundInfo); sqlSession.commit(); @@ -949,8 +990,8 @@ public class SIArchivesBiz { * @param paramReq * @param employeeId */ - public void socialSave(InsuranceArchivesSaveParam paramReq, long employeeId) { - + public void socialSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { + long employeeId = user.getUID(); SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); @@ -977,6 +1018,7 @@ public class SIArchivesBiz { InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() .adjustAfterSchemeId(param.getSocialSchemeId()) .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) .welfareType(paramReq.getWelfareType().getValue()) .employeeId(param.getEmployeeId()) .paymentOrganization(param.getPaymentOrganization()) @@ -990,6 +1032,7 @@ public class SIArchivesBiz { encryptUtil.decrypt(oldSocialInfo, InsuranceArchivesSocialSchemePO.class); adjustInfo.setAdjustBeforeBaseJson(oldSocialInfo.getSocialPaymentBaseString()); adjustInfo.setAdjustBeforeSchemeId(oldSocialInfo.getSocialSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldSocialInfo.getSocialPaymentComBaseString()); //新数据 InsuranceArchivesSocialSchemePO updateSocialInfo = InsuranceArchivesSocialSchemePO.builder() @@ -1010,9 +1053,17 @@ public class SIArchivesBiz { .paymentOrganization(param.getPaymentOrganization()) .build(); //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString())) { + if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { throw new SalaryRunTimeException("社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException("社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); + } + } encryptUtil.encrypt(updateSocialInfo, InsuranceArchivesSocialSchemePO.class); socialSchemeMapper.updateById(updateSocialInfo); //更新base_info表状态 @@ -1048,9 +1099,17 @@ public class SIArchivesBiz { .paymentOrganization(param.getPaymentOrganization()) .build(); //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentBaseString())) { + if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { throw new SalaryRunTimeException("社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException("社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！"); + } + } encryptUtil.encrypt(insertSocialInfo, InsuranceArchivesSocialSchemePO.class); socialSchemeMapper.insert(insertSocialInfo); sqlSession.commit(); @@ -1088,14 +1147,11 @@ public class SIArchivesBiz { * @param paymentBaseString * @return */ - public Boolean checkWelBaseLimit(Long primaryId, String paymentBaseString) { + public Boolean checkWelBaseLimit(Long primaryId, String paymentBaseString, Integer paymentScope) { if (primaryId ==null || paymentBaseString == null) { return true; } - //设置缴纳对象和缴费状态 -// Integer paymentScope = 2; -// Integer isPayment = 1; Map paymentBaseJson = JSON.parseObject(paymentBaseString, new HashMap().getClass()); if (paymentBaseJson == null) { return true; @@ -1119,7 +1175,7 @@ public class SIArchivesBiz { return false; } List isPaymentList = insuranceSchemeDetailPOList.stream() - .filter(f -> f.getIsPayment().equals(IsPaymentEnum.YES.getValue()) && f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_PERSON.getValue())).collect(Collectors.toList()); + .filter(f -> f.getIsPayment().equals(IsPaymentEnum.YES.getValue()) && f.getPaymentScope().equals(paymentScope)).collect(Collectors.toList()); if (isPaymentList.size() > 0) { InsuranceSchemeDetailPO insuranceSchemeDetailPO = isPaymentList.get(0); @@ -2035,6 +2091,11 @@ public class SIArchivesBiz { //生成基数调整记录（基数单元未变化则忽略） public List createAdjustInfo(InsuranceArchivesBaseHistoryDTO adjustInfo, Long creator) { Date now = new Date(); + //判断是否要区分个人和单位福利基数 + User user = new User(Math.toIntExact(creator)); + SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); + boolean welBaseDiffSign = welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); + List toCreateAdjustHistoryList = new ArrayList<>(); //旧档案不存在基数信息，则直接遍历新的基数数据，生成调整记录；旧档案存在基数信息，则合并新旧基数数据，遍历合并后的技术数据中的key，生成调整记录。 if(StringUtils.isNotBlank(adjustInfo.getAdjustAfterBaseJson()) && StringUtils.isBlank(adjustInfo.getAdjustBeforeBaseJson())) { @@ -2053,6 +2114,7 @@ public class SIArchivesBiz { adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope(welBaseDiffSign ? PaymentScopeEnum.SCOPE_PERSON.getValue().toString() : PaymentScopeEnum.SCOPE_PERSON.getValue().toString() + "," + PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); toCreateAdjustHistoryList.add(adjustItem); } } else if (StringUtils.isNotBlank(adjustInfo.getAdjustAfterBaseJson()) && StringUtils.isNotBlank(adjustInfo.getAdjustBeforeBaseJson())) { @@ -2087,12 +2149,75 @@ public class SIArchivesBiz { adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope(welBaseDiffSign ? PaymentScopeEnum.SCOPE_PERSON.getValue().toString() : PaymentScopeEnum.SCOPE_PERSON.getValue().toString() + "," + PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); toCreateAdjustHistoryList.add(adjustItem); } } } + //如果系统应用设置拆分了个人和公司福利基数，则对adjustBeforeComBaseJson，adjustAfterComBaseJson也进行处理 + if (welBaseDiffSign) { + //旧档案不存在基数信息，则直接遍历新的基数数据，生成调整记录；旧档案存在基数信息，则合并新旧基数数据，遍历合并后的技术数据中的key，生成调整记录。 + if(StringUtils.isNotBlank(adjustInfo.getAdjustAfterComBaseJson()) && StringUtils.isBlank(adjustInfo.getAdjustBeforeComBaseJson())) { + Map adjustAfterComBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterComBaseJson(), new TypeReference>() { + }); + for (String key : adjustAfterComBaseMap.keySet()) { + InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO(); + BeanUtils.copyProperties(adjustInfo, adjustItem); + adjustItem.setAdjustWelfareItemId(Long.valueOf(key)); + adjustItem.setAdjustAfterBaseValue((String) adjustAfterComBaseMap.get(key)); + adjustItem.setOperateTime(now); + adjustItem.setOperator(creator); + adjustItem.setCreator(creator); + adjustItem.setCreateTime(now); + adjustItem.setUpdateTime(now); + adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope(PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); + toCreateAdjustHistoryList.add(adjustItem); + } + } else if (StringUtils.isNotBlank(adjustInfo.getAdjustAfterComBaseJson()) && StringUtils.isNotBlank(adjustInfo.getAdjustBeforeComBaseJson())) { + Map adjustAfterComBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterComBaseJson(), new TypeReference>() { + }); + Map adjustBeforeComBaseMap = JSON.parseObject(adjustInfo.getAdjustBeforeComBaseJson(), new TypeReference>() { + }); + Map reDealMap = new HashMap<>(); + if (adjustAfterComBaseMap != null) { + reDealMap.putAll(adjustAfterComBaseMap); + } + if (adjustBeforeComBaseMap != null) { + reDealMap.putAll(adjustBeforeComBaseMap); + } + if (reDealMap.size() >0) { + for (String key : reDealMap.keySet()) { + String beforeValue = (String) adjustBeforeComBaseMap.get(key); + String afterValue = (String) adjustAfterComBaseMap.get(key); + if (SalaryEntityUtil.empty2Zero(beforeValue).compareTo(SalaryEntityUtil.empty2Zero(afterValue)) == 0) { + continue; + } + InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO(); + BeanUtils.copyProperties(adjustInfo, adjustItem); + adjustItem.setAdjustWelfareItemId(Long.valueOf(key)); + adjustItem.setAdjustBeforeBaseValue(beforeValue); + adjustItem.setAdjustAfterBaseValue(afterValue); + adjustItem.setOperateTime(now); + adjustItem.setOperator(creator); + adjustItem.setCreator(creator); + adjustItem.setCreateTime(now); + adjustItem.setUpdateTime(now); + adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope( PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); + + toCreateAdjustHistoryList.add(adjustItem); + } + } + + } + } return toCreateAdjustHistoryList; } diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java index 259cc3e54..a0c2d57e8 100644 --- a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseHistoryDTO.java @@ -70,12 +70,18 @@ public class InsuranceArchivesBaseHistoryDTO { private String adjustAfterBaseJson; + private String adjustBeforeComBaseJson; + + private String adjustAfterComBaseJson; + @TableTitle(title = "对象", dataIndex = "employeeName", key = "employeeName") private String employeeName; @TableTitle(title = "个税扣缴义务人", dataIndex = "paymentOrganizationName", key = "paymentOrganizationName") private String paymentOrganizationName; @TableTitle(title = "福利项名称", dataIndex = "welfareItemName", key = "welfareItemName") private String welfareItemName; + @TableTitle(title = "缴费对象", dataIndex = "paymentScope", key = "paymentScope") + private String paymentScope; @TableTitle(title = "调整前方案", dataIndex = "adjustBeforeSchemeName", key = "adjustBeforeSchemeName") private String adjustBeforeSchemeName; @TableTitle(title = "调整前基数", dataIndex = "adjustBeforeBaseValue", key = "adjustBeforeBaseValue") diff --git a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesSaveParam.java b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesSaveParam.java index 7e4e46fb7..8d086b1ad 100644 --- a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesSaveParam.java +++ b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesSaveParam.java @@ -23,4 +23,6 @@ public class InsuranceArchivesSaveParam { private String baseForm; private String paymentForm; + + private String paymentComForm; } diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseHistoryPO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseHistoryPO.java index 6939c2258..52d31f804 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseHistoryPO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseHistoryPO.java @@ -77,4 +77,6 @@ public class InsuranceArchivesBaseHistoryPO { private Date createTime; private Date updateTime; + + private String paymentScope; } diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml index fc91b8885..56731a58b 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml @@ -14,6 +14,7 @@ + @@ -35,6 +36,7 @@ , t.payment_organization , t.under_take , t.fund_payment_base_string + , t.fund_payment_com_base_string , t.create_time , t.update_time , t.creator @@ -311,6 +313,7 @@ welfare_type = #{welfareType}, fund_payment_base_string = #{fundPaymentBaseString}, + fund_payment_com_base_string = #{fundPaymentComBaseString}, fund_scheme_id = #{fundSchemeId}, fund_end_time = #{fundEndTime}, fund_start_time = #{fundStartTime}, @@ -353,6 +356,7 @@ fund_end_time, fund_start_time, fund_payment_base_string, + fund_payment_com_base_string, supplement_fund_account, create_time, creator, @@ -371,6 +375,7 @@ #{fundEndTime}, #{fundStartTime}, #{fundPaymentBaseString}, + #{fundPaymentComBaseString}, #{supplementFundAccount}, #{createTime}, #{creator}, diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml index d1a18db07..de0febe4f 100644 --- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml @@ -12,6 +12,7 @@ + @@ -31,6 +32,7 @@ , t.payment_organization , t.under_take , t.other_payment_base_string + , t.other_payment_com_base_string , t.create_time , t.update_time , t.creator @@ -292,6 +294,7 @@ welfare_type = #{welfareType}, other_payment_base_string = #{otherPaymentBaseString}, + other_payment_com_base_string = #{otherPaymentComBaseString}, other_scheme_id = #{otherSchemeId}, other_end_time = #{otherEndTime}, other_start_time = #{otherStartTime}, @@ -340,7 +343,8 @@ non_payment, creator, payment_organization, - other_payment_base_string) + other_payment_base_string, + other_payment_com_base_string) VALUES ( #{otherSchemeId}, @@ -356,7 +360,8 @@ #{nonPayment}, #{creator}, #{paymentOrganization}, - #{otherPaymentBaseString} + #{otherPaymentBaseString}, + #{otherPaymentComBaseString} ) \ No newline at end of file diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index 8472020a2..c27048d10 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -13,6 +13,7 @@ + @@ -33,6 +34,7 @@ , t.payment_organization , t.under_take , t.social_payment_base_string + , t.social_payment_com_base_string , t.create_time , t.update_time , t.creator @@ -955,6 +957,7 @@ welfare_type = #{welfareType}, social_payment_base_string = #{socialPaymentBaseString}, + social_payment_com_base_string = #{socialPaymentComBaseString}, social_scheme_id = #{socialSchemeId}, social_end_time = #{socialEndTime}, social_start_time = #{socialStartTime}, @@ -994,6 +997,7 @@ welfare_type, delete_type, social_payment_base_string, + social_payment_com_base_string, social_scheme_id, create_time, social_end_time, @@ -1011,6 +1015,7 @@ #{welfareType}, #{deleteType}, #{socialPaymentBaseString}, + #{socialPaymentComBaseString}, #{socialSchemeId}, #{createTime}, #{socialEndTime}, diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 59b4d8e48..11299554e 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -141,7 +141,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public String insert(InsuranceArchivesSaveParam param) { SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - siArchivesBiz.insert(param, (long) user.getUID()); + siArchivesBiz.insert(param, user); return null; } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 8746fdd48..d49f971e2 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -1102,11 +1102,11 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesAccountPO.setOther(insuranceArchivesOtherSchemePO); insuranceArchivesAccountPO.setBaseInfo(insuranceArchivesBaseInfoPO); //校验福利基数是否符合上下限要求， - Boolean socialCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString()); + Boolean socialCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - Boolean fundCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString()); + Boolean fundCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - Boolean otherCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString()); + Boolean otherCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); if (socialCheckBase && fundCheckBase && otherCheckBase) { insuranceArchivesAccountPOS.add(insuranceArchivesAccountPO); From 6dca2a43800b08f8d4101f40ac6a2ff095f5e817 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 6 Dec 2023 15:38:19 +0800 Subject: [PATCH 004/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=97=B6=EF=BC=8C=E6=A1=A3=E6=A1=88=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=8C=BA=E5=88=86=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8=E7=A6=8F=E5=88=A9=E5=9F=BA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 282 +++++++++++++++--- .../salary/web/SIArchivesController.java | 2 + 2 files changed, 241 insertions(+), 43 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index a58021031..eb4980815 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -13,6 +13,7 @@ import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; +import com.engine.salary.common.SalaryContext; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; @@ -1383,6 +1384,7 @@ public class SIArchivesBiz { * @return */ public List buildWeaTableColumns(List insuranceArchivesEmployeePOS, long operateId) { + Map> titleMap = buildColumnTitle(insuranceArchivesEmployeePOS, operateId); List list = new ArrayList<>(); WeaTableColumn nameColumn = new WeaTableColumn("100px", "姓名", "employeeName"); @@ -1422,6 +1424,9 @@ public class SIArchivesBiz { * @return */ public Map> buildColumnTitle(List insuranceArchivesEmployeePOS, long operateId) { + + boolean welBaseDiffSign = isDiffWelBase(); + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); Map> result = new HashMap<>(); @@ -1437,16 +1442,17 @@ public class SIArchivesBiz { Set fundSet = new HashSet<>(); Set otherSet = new HashSet<>(); + Set socialComSet = new HashSet<>(); + Set fundComSet = new HashSet<>(); + Set otherComSet = new HashSet<>(); + insuranceArchivesEmployeePOS.forEach(item -> { List socialList = socialSchemeMapper.getSocialByEmployeeId(Collections.singletonList(item.getEmployeeId())); encryptUtil.decryptList(socialList, InsuranceArchivesSocialSchemePO.class); -// InsuranceArchivesSocialSchemePO socialItem = socialList.size() != 0 ? socialList.get(0) : null; List fundList = fundSchemeMapper.getFundByEmployeeId(Collections.singletonList(item.getEmployeeId())); encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); -// InsuranceArchivesFundSchemePO fundItem = fundList.size() != 0 ? fundList.get(0) : null; List otherList = otherSchemeMapper.getOtherByEmployeeId(Collections.singletonList(item.getEmployeeId())); encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); -// InsuranceArchivesOtherSchemePO otherItem = otherList.size() != 0 ? otherList.get(0) : null; if (socialList.size() > 0) { for (InsuranceArchivesSocialSchemePO socialSchemePO : socialList) { @@ -1455,6 +1461,14 @@ public class SIArchivesBiz { if (socialJson != null) { socialJson.forEach((k, v) -> socialSet.add(k)); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map socialComJson = JSON.parseObject(socialSchemePO.getSocialPaymentComBaseString(), new TypeReference>() { + }); + if (socialComJson != null) { + socialComJson.forEach((k, v) -> socialComSet.add(k)); + } + } } } @@ -1465,6 +1479,14 @@ public class SIArchivesBiz { if (fundJson != null) { fundJson.forEach((k, v) -> fundSet.add(k)); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map fundComJson = JSON.parseObject(fundSchemePO.getFundPaymentComBaseString(), new TypeReference>() { + }); + if (fundComJson != null) { + fundComJson.forEach((k, v) -> fundComSet.add(k)); + } + } } } @@ -1475,11 +1497,20 @@ public class SIArchivesBiz { if (otherJson != null) { otherJson.forEach((k, v) -> otherSet.add(k)); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map otherComJson = JSON.parseObject(otherSchemePO.getOtherPaymentComBaseString(), new TypeReference>() { + }); + if (otherComJson != null) { + otherComJson.forEach((k, v) -> otherComSet.add(k)); + } + } } } }); Map socialMap = new HashMap<>(); + Map socialComMap = new HashMap<>(); Map socialCollect = new HashMap<>(); Map customSocial = iCategoryMapper.listByWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), null) .stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); @@ -1489,34 +1520,89 @@ public class SIArchivesBiz { socialCollect.putAll(customSocial); socialCollect.putAll(sysSocial); - socialSet.forEach(item -> { - if (socialCollect.containsKey(Long.valueOf(item))) { - socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); - } - }); +// socialSet.forEach(item -> { +// if (socialCollect.containsKey(Long.valueOf(item))) { +// socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); +// } +// }); + if (welBaseDiffSign) { + socialSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "个人"); + } + }); + socialComSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "单位"); + } + }); + } else { + socialSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); + } + }); + } Map fundMap = new HashMap<>(); + Map fundComMap = new HashMap<>(); Map fundCollect = new HashMap<>(); Map customFund = iCategoryMapper.listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), null).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); Map sysFund = iCategoryMapper.listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); fundCollect.putAll(customFund); fundCollect.putAll(sysFund); - fundSet.forEach(item -> { - if (fundCollect.containsKey(Long.valueOf(item))) { - fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); - } - }); +// fundSet.forEach(item -> { +// if (fundCollect.containsKey(Long.valueOf(item))) { +// fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); +// } +// }); + if (welBaseDiffSign) { + fundSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "个人"); + } + }); + fundComSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "单位"); + } + }); + } else { + fundSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); + } + }); + } Map otherMap = new HashMap<>(); + Map otherComMap = new HashMap<>(); Map otherCollect = new HashMap<>(); Map customOther = iCategoryMapper.listByWelfareType(WelfareTypeEnum.OTHER.getValue(), null).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); Map sysOther = iCategoryMapper.listByWelfareType(WelfareTypeEnum.OTHER.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); otherCollect.putAll(customOther); otherCollect.putAll(sysOther); - otherSet.forEach(item -> { - if (otherCollect.containsKey(Long.valueOf(item))) { - otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); - } - }); - +// otherSet.forEach(item -> { +// if (otherCollect.containsKey(Long.valueOf(item))) { +// otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); +// } +// }); + if (welBaseDiffSign) { + otherSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "个人"); + } + }); + otherComSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "单位"); + } + }); + } else { + otherSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); + } + }); + } // map根据key排序 LinkedHashMap socialMapWithAscKey = socialMap.entrySet().stream() .sorted(Map.Entry.comparingByKey()) @@ -1530,6 +1616,23 @@ public class SIArchivesBiz { .sorted(Map.Entry.comparingByKey()) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)); + if (welBaseDiffSign) { + LinkedHashMap socialComMapWithAscKey = socialComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap fundComMapWithAscKey = fundComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap otherComMapWithAscKey = otherComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + socialMapWithAscKey.putAll(socialComMapWithAscKey); + fundMapWithAscKey.putAll(fundComMapWithAscKey); + otherMapWithAscKey.putAll(otherComMapWithAscKey); + } result.put(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), socialMapWithAscKey); result.put(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), fundMapWithAscKey); @@ -1552,6 +1655,9 @@ public class SIArchivesBiz { * @return */ public List> buildTableData(List insuranceArchivesEmployeePOS, boolean export) { + + boolean welBaseDiffSign = isDiffWelBase(); + List taxAgentPOS = getTaxAgentMapper().listAll(); Map longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId); @@ -1599,16 +1705,39 @@ public class SIArchivesBiz { map.put("socialName", insuranceSchemeMapper.querySchemeName(socialItem.getSocialSchemeId())); Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { }); - if (socialJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId()); - socialJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } + if (welBaseDiffSign) { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map socialComJson = JSON.parseObject(socialItem.getSocialPaymentComBaseString(), new TypeReference>() { }); -// map.putAll(socialJson); + if (socialComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + socialComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } } + map.put("socialAccount", socialItem.getSocialAccount()); map.put("socialStartTime", socialItem.getSocialStartTime()); map.put("socialEndTime", socialItem.getSocialEndTime()); @@ -1618,16 +1747,39 @@ public class SIArchivesBiz { map.put("fundAccount", fundItem.getFundAccount()); Map fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference>() { }); - if (fundJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId()); - fundJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } + if (welBaseDiffSign) { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map fundComJson = JSON.parseObject(fundItem.getFundPaymentComBaseString(), new TypeReference>() { }); -// map.putAll(fundJson); + if (fundComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } } + map.put("supplementFundAccount", fundItem.getSupplementFundAccount()); map.put("fundStartTime", fundItem.getFundStartTime()); map.put("fundEndTime", fundItem.getFundEndTime()); @@ -1637,16 +1789,39 @@ public class SIArchivesBiz { map.put("otherName", insuranceSchemeMapper.querySchemeName(otherItem.getOtherSchemeId())); Map otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference>() { }); - if (otherJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId()); - otherJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } + if (welBaseDiffSign) { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map otherComJson = JSON.parseObject(otherItem.getOtherPaymentComBaseString(), new TypeReference>() { }); -// map.putAll(otherJson); + if (otherComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } } + map.put("otherStartTime", otherItem.getOtherStartTime()); map.put("otherEndTime", otherItem.getOtherEndTime()); } @@ -1669,6 +1844,19 @@ public class SIArchivesBiz { } return insuranceIdList; } + + public List payInsuranceIds(Long socialSchemeId, Integer paymentScope) { + //查询该福利方案下开启缴纳的福利项 + List detailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(socialSchemeId); + List insuranceIdList = new ArrayList<>(); + if (detailPOS != null && detailPOS.size() > 0) { + //开启缴纳的 + insuranceIdList = detailPOS.stream().filter(f -> f.getIsPayment().equals(IsPaymentEnum.YES.getValue()) && f.getPaymentScope().equals(paymentScope)) + .map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); + } + return insuranceIdList; + } + /** * 获取信息提示 */ @@ -2296,4 +2484,12 @@ public class SIArchivesBiz { list.add(new WeaTableColumn("150px", "操作时间", "operatorTime")); return list; } + + public boolean isDiffWelBase() { + User user = (User) SalaryContext.get().getValue("user"); + //判断是否要区分个人和单位福利基数 + SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); + + return welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); + } } diff --git a/src/com/engine/salary/web/SIArchivesController.java b/src/com/engine/salary/web/SIArchivesController.java index ecc61b1b5..e0b3bfe89 100644 --- a/src/com/engine/salary/web/SIArchivesController.java +++ b/src/com/engine/salary/web/SIArchivesController.java @@ -2,6 +2,7 @@ package com.engine.salary.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; +import com.engine.salary.common.SalaryContext; import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseHistoryDTO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.InsuranceArchivesSaveParam; @@ -33,6 +34,7 @@ import java.util.Map; public class SIArchivesController { private SIArchivesService getService(User user) { + SalaryContext.get().setValue("user",user); return ServiceUtil.getService(SIArchivesServiceImpl.class,user); } From 2a02e17c15e57958e48a68fd099a033c7bf4201d Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 6 Dec 2023 15:55:47 +0800 Subject: [PATCH 005/169] temp --- .../salary/service/impl/SalaryAcctResultServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 734f2ade4..f051dfefd 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1151,12 +1151,13 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe }); // 入库 if (CollectionUtils.isNotEmpty(needUpdateList)) { - getSalaryAcctResultMapper().batchUpdate(needUpdateList); - } + // 数据加密 + encryptUtil.encryptList(needUpdateList, SalaryAcctResultPO.class); + List> partition = Lists.partition(needUpdateList, 100); + partition.forEach(getSalaryAcctResultMapper()::batchUpdate); - if (CollectionUtils.isNotEmpty(needInsertList)) { - getSalaryAcctResultMapper().batchInsert(needInsertList); } + batchSave(needInsertList); } } From 419baeb8cd41050570327b61d740d16b949728b6 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 6 Dec 2023 16:05:08 +0800 Subject: [PATCH 006/169] =?UTF-8?q?=E9=B2=81=E6=8E=A7=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIAccountBiz.java | 1 - .../salary/component/WeaTableColumnGroup.java | 12 ++++ .../salaryacct/bo/SalaryAcctRecordBO.java | 3 + .../salaryacct/bo/SalaryAcctResultBO.java | 23 ++++---- .../dto/SalaryAcctResultDetailDTO.java | 3 + .../param/SalaryAcctResultBatchEditParam.java | 4 +- .../SalaryAcctResultBatchUpdateParam.java | 2 +- .../service/SalaryAcctRecordService.java | 2 +- .../service/SalaryAcctReportService.java | 2 + .../service/SalaryAcctResultService.java | 4 +- .../impl/SalaryAcctRecordServiceImpl.java | 3 +- .../impl/SalaryAcctReportServiceImpl.java | 13 +++++ .../impl/SalaryAcctResultServiceImpl.java | 58 +++++++++++++++---- .../salary/web/SalaryAcctController.java | 10 ++-- .../wrapper/SalaryAcctRecordWrapper.java | 2 +- .../wrapper/SalaryAcctResultWrapper.java | 6 +- 16 files changed, 109 insertions(+), 39 deletions(-) diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 4ba839d57..4e5d4378e 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -7,7 +7,6 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.cache.SalaryCacheKey; import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.progress.ProgressDTO; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; diff --git a/src/com/engine/salary/component/WeaTableColumnGroup.java b/src/com/engine/salary/component/WeaTableColumnGroup.java index dac9a3569..0dcd305af 100644 --- a/src/com/engine/salary/component/WeaTableColumnGroup.java +++ b/src/com/engine/salary/component/WeaTableColumnGroup.java @@ -18,6 +18,11 @@ public class WeaTableColumnGroup extends WeaTableColumn { */ private Integer pattern; + /** + * 字段类型 + */ + private String dataType; + private List children; public WeaTableColumnGroup() { @@ -40,6 +45,13 @@ public class WeaTableColumnGroup extends WeaTableColumn { this.pattern = pattern; } + public WeaTableColumnGroup(String width, String text, String column, String lockStatus, Integer pattern, String dataType) { + super(width, text, column); + this.lockStatus = lockStatus; + this.pattern = pattern; + this.dataType = dataType; + } + public WeaTableColumnGroup(String width, String text, String column, List children) { super(width, text, column); diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index f07aa7d36..11a44f311 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -67,13 +67,16 @@ public class SalaryAcctRecordBO { btnList.add(new WeaTableOperate("删除", null, "1")); } btnList.add(new WeaTableOperate("归档", null, "2")); + btnList.add(new WeaTableOperate("结转", null, "6")); } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && ( salarySendMap.get(salaryAcctRecordPO.getId()) ==Boolean.TRUE ) ){ btnList.add(new WeaTableOperate("查看", null, "3")); btnList.add(new WeaTableOperate("重新核算", null, "4")); btnList.add(new WeaTableOperate("回算", null, "5")); + btnList.add(new WeaTableOperate("结转", null, "6")); } else { btnList.add(new WeaTableOperate("查看", null, "3")); btnList.add(new WeaTableOperate("重新核算", null, "4")); + btnList.add(new WeaTableOperate("结转", null, "6")); } return SalaryAcctRecordListDTO.builder() .id(salaryAcctRecordPO.getId()) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 29cae5d4a..bfa7210cc 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -141,9 +141,9 @@ public class SalaryAcctResultBO { List childrenColumns = Lists.newArrayList(); for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) { if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) { - childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); + childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType())); } else { - childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); + childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType())); } } WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup("150", salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns); @@ -152,18 +152,18 @@ public class SalaryAcctResultBO { // 没有分类的薪资项目 for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) { if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) { - columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType())); } else { - columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType())); } } // 回算的薪资项目 for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getBackCalcItems()) { if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) { - columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType())); } else { - columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern(), salarySobItemDTO.getDataType())); } } @@ -378,7 +378,8 @@ public class SalaryAcctResultBO { List salarySobBackItemPOS, List salaryBackItemPOS, Map salaryBackItemFormula, - Map formulaContentMap) { + Map formulaContentMap, + List lockItems) { // 员工信息字段 Map employeeFieldValueMap = SalaryAcctFormulaBO.convert2FormulaEmployee(simpleEmployee); @@ -407,7 +408,7 @@ public class SalaryAcctResultBO { List groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(),Collections.emptyList()); if(CollectionUtils.isNotEmpty(groupItems)){ List items = groupItems.stream() - .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap)) + .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, lockItems)) .collect(Collectors.toList()); itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder() .salarySobItemGroupId(groupPO.getId()) @@ -420,7 +421,7 @@ public class SalaryAcctResultBO { List noGroupItems = salarySobItemPOMap.getOrDefault(0L, Collections.emptyList()); if(CollectionUtils.isNotEmpty(noGroupItems)){ List items = noGroupItems.stream() - .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap)) + .map(salarySobItemPO -> convert2SalaryAcctResultDetailItemDTO(salarySobItemPO, salaryItemMap.get(salarySobItemPO.getSalaryItemId()), resultValueMap, formulaContentMap, lockItems)) .collect(Collectors.toList()); itemsByGroup.add(SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemByGroupDTO.builder() .salarySobItemGroupId(0L) @@ -492,7 +493,8 @@ public class SalaryAcctResultBO { private static SalaryAcctResultDetailDTO.SalaryAcctResultDetailItemDTO convert2SalaryAcctResultDetailItemDTO(SalarySobItemPO salarySobItemPO, SalaryItemPO salaryItemPO, Map resultValueMap, - Map formulaContentMap) { + Map formulaContentMap, + List lockItems) { SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(Optional.ofNullable(salarySobItemPO).map(SalarySobItemPO::getValueType).orElse(0)); String itemFormulaContent; @@ -512,6 +514,7 @@ public class SalaryAcctResultBO { // .canEdit(Objects.equals(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getUseInEmployeeSalary).orElse(0), 0)) .canEdit(true) .pattern(salarySobItemPO.getPattern()) + .lockStatus(lockItems.contains(salarySobItemPO.getSalaryItemId()) ? LockStatusEnum.LOCK.getValue() : LockStatusEnum.UNLOCK.getValue()) .build(); } diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java index 1929494a9..8fadd2670 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java @@ -71,6 +71,9 @@ public class SalaryAcctResultDetailDTO { // 保留小数位数 private Integer pattern; + + // 锁定状态 + private String lockStatus; } @Data diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java index 21922043c..487527d51 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java @@ -28,10 +28,10 @@ public class SalaryAcctResultBatchEditParam { @Builder @AllArgsConstructor @NoArgsConstructor - public class resultValue { + public static class resultValue { // 薪资核算人员id - private Long salaryAcctEmpId; + private Long id; // 薪资项目值 private List items; diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java index 8eabde532..141b3a004 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java @@ -29,7 +29,7 @@ public class SalaryAcctResultBatchUpdateParam { private Long salaryItemId; // 薪资核算人员id - private List salaryAcctEmpIdList; + private List idList; //薪资项目值 private String value; diff --git a/src/com/engine/salary/service/SalaryAcctRecordService.java b/src/com/engine/salary/service/SalaryAcctRecordService.java index 319552b78..9c3ba4f8c 100644 --- a/src/com/engine/salary/service/SalaryAcctRecordService.java +++ b/src/com/engine/salary/service/SalaryAcctRecordService.java @@ -209,7 +209,7 @@ public interface SalaryAcctRecordService { List listSome(SalaryAcctRecordPO po); /** - * 鲁控数字-结账 + * 鲁控数字-结转 * @param salaryAcctRecordId */ void lkszJz(Long salaryAcctRecordId); diff --git a/src/com/engine/salary/service/SalaryAcctReportService.java b/src/com/engine/salary/service/SalaryAcctReportService.java index c4c1636db..6cf5caa12 100644 --- a/src/com/engine/salary/service/SalaryAcctReportService.java +++ b/src/com/engine/salary/service/SalaryAcctReportService.java @@ -21,6 +21,8 @@ public interface SalaryAcctReportService { */ void batchSave(Collection pos); + void lkszBatchSave(Collection pos); + /** * 根据核算记录删除 * @param salaryAcctRecordIds diff --git a/src/com/engine/salary/service/SalaryAcctResultService.java b/src/com/engine/salary/service/SalaryAcctResultService.java index 871188360..ec8efb878 100644 --- a/src/com/engine/salary/service/SalaryAcctResultService.java +++ b/src/com/engine/salary/service/SalaryAcctResultService.java @@ -206,10 +206,10 @@ public interface SalaryAcctResultService { Boolean checkAuth(Long salaryAcctRecordId); /** - * 鲁控数字薪资核算结果批量更新 + * 薪资核算结果批量更新 * @param param */ - void lkszBatchUpdate(SalaryAcctResultBatchUpdateParam param); + void batchUpdate(SalaryAcctResultBatchUpdateParam param); /** * 鲁控数字薪资核算结果批量编辑 diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 1a189f762..ee596af21 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -906,7 +906,6 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 入库 getSalaryAcctResultService(user).batchSave(needInsertResultList); - getSalaryAcctReportService(user).batchSave(needInsertResultReportList); - + getSalaryAcctReportService(user).lkszBatchSave(needInsertResultReportList); } } diff --git a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java index 8371241fb..43b7160a8 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java @@ -62,6 +62,19 @@ public class SalaryAcctReportServiceImpl extends Service implements SalaryAcctRe } } + @Override + public void lkszBatchSave(Collection pos) { + if (CollectionUtils.isNotEmpty(pos)) { + SalarySysConfPO disPlay = getSalarySysConfService(user).getOneByCode(DISPLAY_EMP_INFO_REPORT); + //默认不显示，关闭状态 + if (disPlay == null || OpenEnum.OFF.getValue().equals(disPlay.getConfValue())) { + pos = encryptUtil.encryptList(new ArrayList<>(pos), SalaryAcctResultReportPO.class); + } + List> partition = Lists.partition((List) pos, 100); + partition.forEach(getSalaryAcctResultReportMapper()::batchInsert); + } + } + @Override public void deleteBySalaryAcctRecordIds(Collection salaryAcctRecordIds) { if (CollectionUtils.isNotEmpty(salaryAcctRecordIds)) { diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index f051dfefd..34148f289 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -54,6 +54,7 @@ import com.google.common.collect.Sets; import com.weaver.util.threadPool.ThreadPoolUtil; import com.weaver.util.threadPool.constant.ModulePoolEnum; import com.weaver.util.threadPool.entity.LocalRunnable; +import dm.jdbc.util.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -301,9 +302,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe TaxAgentPO taxAgent = getTaxAgentService(user).getById(salaryAcctEmployeePO.getTaxAgentId()); // 查询公式 Map formulaContentMap = getSalaryAcctResultService(user).getColumnBySalaryAcctRecordId(salaryAcctEmployeePO.getSalaryAcctRecordId()); + List lockItems = byId.getLockSalaryItemIds() == null ? Collections.emptyList() : byId.getLockSalaryItemIds(); // 转换成薪资核算结果详情dto - return SalaryAcctResultBO.convert2DetailDTO(simpleEmployee, taxAgent, salaryAcctEmployeePO, salarySobEmpFieldPOS, salarySobItemGroupPOS, salarySobItemPOS, salaryItemPOS, salaryAcctResultPOS, salarySobBackItemPOList, salaryBackItemPOS, salaryBackItemFormula, formulaContentMap); + return SalaryAcctResultBO.convert2DetailDTO(simpleEmployee, taxAgent, salaryAcctEmployeePO, salarySobEmpFieldPOS, salarySobItemGroupPOS, salarySobItemPOS, salaryItemPOS, salaryAcctResultPOS, salarySobBackItemPOList, salaryBackItemPOS, salaryBackItemFormula, formulaContentMap, lockItems); } @Override @@ -1093,7 +1095,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } @Override - public void lkszBatchUpdate(SalaryAcctResultBatchUpdateParam param) { + public void batchUpdate(SalaryAcctResultBatchUpdateParam param) { ValidUtil.doValidator(param); SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId()); @@ -1107,12 +1109,12 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe throw new SalaryRunTimeException("该账套不包含该薪资项目或已被删除，请先检查账套"); } // 获取需要更新的核算人员信息 - List salaryAcctEmployeePOList = Collections.emptyList(); - if (CollectionUtils.isEmpty(param.getSalaryAcctEmpIdList())) { + List salaryAcctEmployeePOList = new ArrayList<>(); + if (CollectionUtils.isEmpty(param.getIdList())) { // 没有选择核算人员，更新核算记录中所有人员 salaryAcctEmployeePOList.addAll(getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salaryAcctRecordPO.getId())); } else { - salaryAcctEmployeePOList.addAll(getSalaryAcctEmployeeService(user).listByIds(param.getSalaryAcctEmpIdList())); + salaryAcctEmployeePOList.addAll(getSalaryAcctEmployeeService(user).listByIds(param.getIdList())); } if (CollectionUtils.isNotEmpty(salaryAcctEmployeePOList)) { @@ -1120,9 +1122,12 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算结果 List resultPOS = listByAcctEmployeeIdsAndSalaryItemIds(salaryAcctEmployeeIdList, Collections.singleton(param.getSalaryItemId())); Map salaryAcctResultPOMap = SalaryEntityUtil.convert2Map(resultPOS, SalaryAcctResultPO::getSalaryAcctEmpId); + List dataCollectionEmployees = getSalaryEmployeeService(user).listAllForReport(); + Map emps = SalaryEntityUtil.convert2Map(dataCollectionEmployees, DataCollectionEmployee::getEmployeeId); List needUpdateList = new ArrayList<>(); List needInsertList = new ArrayList<>(); Date now = new Date(); + List salaryAcctResultReportPOS = new ArrayList<>(); salaryAcctEmployeePOList.forEach(salaryAcctEmployeePO -> { if (salaryAcctResultPOMap.containsKey(salaryAcctEmployeePO.getId())) { // 更新 @@ -1139,7 +1144,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe .salaryAcctEmpId(salaryAcctEmployeePO.getId()) .employeeId(salaryAcctEmployeePO.getEmployeeId()) .taxAgentId(salaryAcctEmployeePO.getTaxAgentId()) - .resultValue(StringUtils.trim(param.getValue())) + .resultValue(param.getValue()) .originResultValue("") .creator(Long.valueOf(user.getUID())) .createTime(now) @@ -1148,16 +1153,47 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) .build()); } + + // 报表 + SalaryAcctResultReportPO po = SalaryAcctResultReportPO.builder() + .id(IdGenerator.generate()) + .salarySobId(salaryAcctRecordPO.getSalarySobId()) + .salaryItemId(param.getSalaryItemId()) + .salaryAcctRecordId(param.getSalaryAcctRecordId()) + .salaryAcctEmpId(salaryAcctEmployeePO.getId().toString()) + .employeeId(salaryAcctEmployeePO.getEmployeeId().toString()) + .taxAgentId(salaryAcctEmployeePO.getTaxAgentId()) + .resultValue(param.getValue()) + .creator(Long.valueOf(user.getUID())) + .createTime(now) + .updateTime(now) + .deleteType(NumberUtils.INTEGER_ZERO) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + DataCollectionEmployee dataCollectionEmployee = emps.get(salaryAcctEmployeePO.getEmployeeId()); + if (dataCollectionEmployee != null) { + po.setDepartmentId(dataCollectionEmployee.getDepartmentId()); + po.setSubcompanyId(dataCollectionEmployee.getSubcompanyid()); + po.setCostcenterId(dataCollectionEmployee.getCostcenterId()); + po.setJobtitleId(dataCollectionEmployee.getJobtitleId()); + po.setLocationId(dataCollectionEmployee.getLocationId()); + } + salaryAcctResultReportPOS.add(po); }); + // 入库 if (CollectionUtils.isNotEmpty(needUpdateList)) { // 数据加密 encryptUtil.encryptList(needUpdateList, SalaryAcctResultPO.class); List> partition = Lists.partition(needUpdateList, 100); partition.forEach(getSalaryAcctResultMapper()::batchUpdate); - } batchSave(needInsertList); + + // 报表入库前先删除 + getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(param.getIdList(), Collections.singletonList(param.getSalaryItemId()) ); + getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); + } } @@ -1175,7 +1211,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe Map salaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(salaryAcctEmployeePOList, SalaryAcctEmployeePO::getId); // 需要更新数据的薪资核算人员id - List updateAcctEmpIds = param.getResultValueList().stream().map(SalaryAcctResultBatchEditParam.resultValue::getSalaryAcctEmpId).collect(Collectors.toList()); + List updateAcctEmpIds = param.getResultValueList().stream().map(SalaryAcctResultBatchEditParam.resultValue::getId).collect(Collectors.toList()); // 查询原来的薪资核算结果 List salaryAcctResultPOSOld = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpIds(updateAcctEmpIds).build()); // 解密 @@ -1189,7 +1225,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe s -> s.map(SalaryAcctResultPO::getOriginResultValue).orElse("")))); List salaryAcctResultReportPOS = new ArrayList<>(); param.getResultValueList().forEach(resultValue -> { - SalaryAcctEmployeePO salaryAcctEmployeePO = salaryAcctEmployeePOMap.get(resultValue.getSalaryAcctEmpId()); + SalaryAcctEmployeePO salaryAcctEmployeePO = salaryAcctEmployeePOMap.get(resultValue.getId()); salaryAcctResultPOS.addAll(SalaryAcctResultBO.batchEditConvert2PO(salaryAcctResultOldPOMap, resultValue.getItems(), salaryAcctEmployeePO, (long) user.getUID())); // 报表 salaryAcctResultReportPOS.addAll(SalaryAcctResultReportBO.lkszConvert2PO(resultValue.getItems(), salaryAcctEmployeePO, (long) user.getUID(), emps)); @@ -1198,9 +1234,9 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 删除原来的薪资核算结果 param.getResultValueList().stream().forEach(resultValue -> { List saveItemIds = resultValue.getItems().stream().map(SalaryAcctResultSaveParam.SalaryAcctResultDetailItemParam::getSalaryItemId).collect(Collectors.toList()); - deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getSalaryAcctEmpId()), saveItemIds); + deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getId()), saveItemIds); // 报表 - getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getSalaryAcctEmpId()), saveItemIds); + getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getId()), saveItemIds); }); // 保存薪资核算结果 diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 45de6654d..027678e1d 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -159,7 +159,7 @@ public class SalaryAcctController { return new ResponseResult(user).run(getSalaryAcctRecordWrapper(user)::backCalculate, param.getSalaryAcctRecordId()); } - // 结账 + // 结转 @GET @Path("/lkszJz") @Produces(MediaType.APPLICATION_JSON) @@ -457,13 +457,13 @@ public class SalaryAcctController { return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::updateLockStatusByParam, param); } - //鲁控数字批量更新 + //批量更新 @POST - @Path("/acctresult/lkszBatchUpdate") + @Path("/acctresult/batchUpdate") @Produces(MediaType.APPLICATION_JSON) - public String lkszBatchUpdate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctResultBatchUpdateParam param) { + public String batchUpdate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctResultBatchUpdateParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::lkszBatchUpdate, param); + return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::batchUpdate, param); } //鲁控数字批量编辑 diff --git a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java index 5cd43cecb..9bf20496d 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java @@ -260,7 +260,7 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord } /** - * 鲁控数字-结账 + * 鲁控数字-结转 * @param salaryAcctRecordId */ public void lkszJz(Long salaryAcctRecordId) { diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index 59bbd3093..2bf31ef9c 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -258,11 +258,11 @@ public class SalaryAcctResultWrapper extends Service { } /** - * 鲁控数字薪资核算结果批量更新 + * 薪资核算结果批量更新 * @param param */ - public void lkszBatchUpdate(SalaryAcctResultBatchUpdateParam param) { - getSalaryAcctResultService(user).lkszBatchUpdate(param); + public void batchUpdate(SalaryAcctResultBatchUpdateParam param) { + getSalaryAcctResultService(user).batchUpdate(param); } /** From 1287a97fe5a6f8eaed47559b222067cf0c6f965b Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 7 Dec 2023 09:41:46 +0800 Subject: [PATCH 007/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E3=80=81=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=81=E5=9F=BA=E6=95=B0=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E5=9F=BA=E6=95=B0=E9=80=BB=E8=BE=91=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 11 +- .../mapper/siarchives/FundSchemeMapper.xml | 6 + .../InsuranceBaseAdjustHistoryMapper.xml | 20 +- .../mapper/siarchives/OtherSchemeMapper.xml | 18 +- .../mapper/siarchives/SocialSchemeMapper.xml | 6 + .../service/impl/SIArchivesServiceImpl.java | 14 ++ .../service/impl/SIImportServiceImpl.java | 28 ++- .../service/impl/SISchemeServiceImpl.java | 187 ++++++++++++++---- 8 files changed, 234 insertions(+), 56 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index eb4980815..fbf526ca6 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -2198,6 +2198,7 @@ public class SIArchivesBiz { InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() .adjustAfterSchemeId(po.getSocialSchemeId()) .adjustAfterBaseJson(po.getSocialPaymentBaseString()) + .adjustAfterComBaseJson(po.getSocialPaymentComBaseString()) .welfareType(po.getWelfareType()) .employeeId(po.getEmployeeId()) .paymentOrganization(po.getPaymentOrganization()) @@ -2207,6 +2208,7 @@ public class SIArchivesBiz { InsuranceArchivesSocialSchemePO oldBaseInfo = oldBaseInfoList.get(0); encryptUtil.decrypt(oldBaseInfo, InsuranceArchivesSocialSchemePO.class); adjustInfo.setAdjustBeforeBaseJson(oldBaseInfo.getSocialPaymentBaseString()); + adjustInfo.setAdjustBeforeComBaseJson(oldBaseInfo.getSocialPaymentComBaseString()); adjustInfo.setAdjustBeforeSchemeId(oldBaseInfo.getSocialSchemeId()); } else if (oldBaseInfoList.size() > 1) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保档案存在冗余数据！")); @@ -2228,6 +2230,7 @@ public class SIArchivesBiz { InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() .adjustAfterSchemeId(po.getFundSchemeId()) .adjustAfterBaseJson(po.getFundPaymentBaseString()) + .adjustAfterComBaseJson(po.getFundPaymentComBaseString()) .welfareType(po.getWelfareType()) .employeeId(po.getEmployeeId()) .paymentOrganization(po.getPaymentOrganization()) @@ -2237,6 +2240,7 @@ public class SIArchivesBiz { InsuranceArchivesFundSchemePO oldBaseInfo = oldBaseInfoList.get(0); encryptUtil.decrypt(oldBaseInfo, InsuranceArchivesFundSchemePO.class); adjustInfo.setAdjustBeforeBaseJson(oldBaseInfo.getFundPaymentBaseString()); + adjustInfo.setAdjustBeforeComBaseJson(oldBaseInfo.getFundPaymentComBaseString()); adjustInfo.setAdjustBeforeSchemeId(oldBaseInfo.getFundSchemeId()); } else if (oldBaseInfoList.size() > 1) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金档案存在冗余数据！")); @@ -2257,6 +2261,7 @@ public class SIArchivesBiz { InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() .adjustAfterSchemeId(po.getOtherSchemeId()) .adjustAfterBaseJson(po.getOtherPaymentBaseString()) + .adjustAfterComBaseJson(po.getOtherPaymentComBaseString()) .welfareType(po.getWelfareType()) .employeeId(po.getEmployeeId()) .paymentOrganization(po.getPaymentOrganization()) @@ -2266,6 +2271,7 @@ public class SIArchivesBiz { InsuranceArchivesOtherSchemePO oldBaseInfo = oldBaseInfoList.get(0); encryptUtil.decrypt(oldBaseInfo, InsuranceArchivesOtherSchemePO.class); adjustInfo.setAdjustBeforeBaseJson(oldBaseInfo.getOtherPaymentBaseString()); + adjustInfo.setAdjustBeforeComBaseJson(oldBaseInfo.getOtherPaymentComBaseString()); adjustInfo.setAdjustBeforeSchemeId(oldBaseInfo.getOtherSchemeId()); } else if (oldBaseInfoList.size() > 1) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利档案存在冗余数据！")); @@ -2279,10 +2285,7 @@ public class SIArchivesBiz { //生成基数调整记录（基数单元未变化则忽略） public List createAdjustInfo(InsuranceArchivesBaseHistoryDTO adjustInfo, Long creator) { Date now = new Date(); - //判断是否要区分个人和单位福利基数 - User user = new User(Math.toIntExact(creator)); - SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); - boolean welBaseDiffSign = welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); + boolean welBaseDiffSign = isDiffWelBase(); List toCreateAdjustHistoryList = new ArrayList<>(); //旧档案不存在基数信息，则直接遍历新的基数数据，生成调整记录；旧档案存在基数信息，则合并新旧基数数据，遍历合并后的技术数据中的key，生成调整记录。 diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml index 56731a58b..afdde68a1 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml @@ -137,6 +137,7 @@ fund_end_time, fund_start_time, fund_payment_base_string, + fund_payment_com_base_string, supplement_fund_account, create_time, creator, @@ -156,6 +157,7 @@ #{item.fundEndTime}, #{item.fundStartTime}, #{item.fundPaymentBaseString}, + #{item.fundPaymentComBaseString}, #{item.supplementFundAccount}, #{item.createTime}, #{item.creator}, @@ -177,6 +179,7 @@ fund_end_time, fund_start_time, fund_payment_base_string, + fund_payment_com_base_string, supplement_fund_account, create_time, creator, @@ -195,6 +198,7 @@ #{item.fundEndTime,jdbcType=VARCHAR}, #{item.fundStartTime,jdbcType=VARCHAR}, #{item.fundPaymentBaseString,jdbcType=VARCHAR}, + #{item.fundPaymentComBaseString,jdbcType=VARCHAR}, #{item.supplementFundAccount,jdbcType=VARCHAR}, #{item.createTime,jdbcType=DATE}, #{item.creator,jdbcType=DOUBLE}, @@ -217,6 +221,7 @@ fund_end_time, fund_start_time, fund_payment_base_string, + fund_payment_com_base_string, supplement_fund_account, create_time, creator, @@ -235,6 +240,7 @@ #{item.fundEndTime}, #{item.fundStartTime}, #{item.fundPaymentBaseString}, + #{item.fundPaymentComBaseString}, #{item.supplementFundAccount}, #{item.createTime}, #{item.creator}, diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseAdjustHistoryMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseAdjustHistoryMapper.xml index da02c83b5..0752177a1 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseAdjustHistoryMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseAdjustHistoryMapper.xml @@ -12,6 +12,7 @@ + @@ -33,6 +34,7 @@ , t.adjust_before_base_value , t.adjust_after_base_value , t.adjust_welfare_item_id + , t.payment_scope , t.operator , t.operate_time , t.create_time @@ -48,7 +50,7 @@ adjust_before_scheme_id,adjust_after_scheme_id, adjust_before_base_value,adjust_after_base_value, adjust_welfare_item_id,operator,operate_time, - tenant_key,creator,delete_type,create_time,update_time) + tenant_key,creator,delete_type,create_time,update_time,payment_scope) VALUES ( @@ -67,7 +69,8 @@ #{item.creator}, #{item.deleteType}, #{item.createTime}, - #{item.updateTime} + #{item.updateTime}, + #{item.paymentScope} ) @@ -77,7 +80,7 @@ adjust_before_scheme_id,adjust_after_scheme_id, adjust_before_base_value,adjust_after_base_value, adjust_welfare_item_id,operator,operate_time, - tenant_key,creator,delete_type,create_time,update_time) + tenant_key,creator,delete_type,create_time,update_time,payment_scope) select #{item.id,jdbcType=DOUBLE}, @@ -95,7 +98,8 @@ #{item.creator,jdbcType=DOUBLE}, #{item.deleteType}, #{item.createTime}, - #{item.updateTime} + #{item.updateTime}, + #{item.paymentScope} from dual @@ -106,7 +110,7 @@ adjust_before_scheme_id,adjust_after_scheme_id, adjust_before_base_value,adjust_after_base_value, adjust_welfare_item_id,operator,operate_time, - tenant_key,creator,delete_type,create_time,update_time) + tenant_key,creator,delete_type,create_time,update_time,payment_scope) VALUES ( #{item.id}, @@ -124,7 +128,8 @@ #{item.creator}, #{item.deleteType}, #{item.createTime}, - #{item.updateTime} + #{item.updateTime}, + #{item.paymentScope} ) @@ -148,6 +153,7 @@ , eo.lastname as operatorName , ee.lastname as employeeName , p.name as paymentOrganizationName + , t.payment_scope FROM hrsa_insurance_base_history t LEFT JOIN hrmresource eo on eo.id = t.operator LEFT JOIN hrmresource ee on ee.id = t.employee_id @@ -180,6 +186,7 @@ , eo.lastname as operatorName , ee.lastname as employeeName , p.name as paymentOrganizationName + , t.payment_scope FROM hrsa_insurance_base_history t LEFT JOIN hrmresource eo on eo.id = t.operator LEFT JOIN hrmresource ee on ee.id = t.employee_id @@ -216,6 +223,7 @@ , eo.lastname as operatorName , ee.username as employeeName , p.name as paymentOrganizationName + , t.payment_scope FROM hrsa_insurance_base_history t LEFT JOIN hrmresource eo on eo.id = t.operator LEFT JOIN hrsa_external_employee ee on ee.id = t.employee_id diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml index de0febe4f..2d67257b4 100644 --- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml @@ -131,7 +131,8 @@ non_payment, creator, payment_organization, - other_payment_base_string) + other_payment_base_string, + other_payment_com_base_string) VALUES ( @@ -148,7 +149,8 @@ #{item.nonPayment}, #{item.creator}, #{item.paymentOrganization}, - #{item.otherPaymentBaseString} + #{item.otherPaymentBaseString}, + #{item.otherPaymentComBaseString} ) @@ -167,7 +169,8 @@ non_payment, creator, payment_organization, - other_payment_base_string) + other_payment_base_string, + other_payment_com_base_string) select #{item.otherSchemeId,jdbcType=DOUBLE}, @@ -183,7 +186,8 @@ #{item.nonPayment,jdbcType=INTEGER}, #{item.creator,jdbcType=DOUBLE}, #{item.paymentOrganization,jdbcType=DOUBLE}, - #{item.otherPaymentBaseString,jdbcType=VARCHAR} + #{item.otherPaymentBaseString,jdbcType=VARCHAR}, + #{item.otherPaymentComBaseString,jdbcType=VARCHAR} from dual @@ -203,7 +207,8 @@ non_payment, creator, payment_organization, - other_payment_base_string) + other_payment_base_string, + other_payment_com_base_string) VALUES ( #{item.otherSchemeId}, @@ -219,7 +224,8 @@ #{item.nonPayment}, #{item.creator}, #{item.paymentOrganization}, - #{item.otherPaymentBaseString} + #{item.otherPaymentBaseString}, + #{item.otherPaymentComBaseString} ) diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index c27048d10..79562932f 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -130,6 +130,7 @@ welfare_type, delete_type, social_payment_base_string, + social_payment_com_base_string, social_scheme_id, create_time, social_end_time, @@ -148,6 +149,7 @@ #{item.welfareType}, #{item.deleteType}, #{item.socialPaymentBaseString}, + #{item.socialPaymentComBaseString}, #{item.socialSchemeId}, #{item.createTime}, #{item.socialEndTime}, @@ -168,6 +170,7 @@ welfare_type, delete_type, social_payment_base_string, + social_payment_com_base_string, social_scheme_id, create_time, social_end_time, @@ -185,6 +188,7 @@ #{item.welfareType,jdbcType=INTEGER}, #{item.deleteType,jdbcType=INTEGER}, #{item.socialPaymentBaseString,jdbcType=VARCHAR}, + #{item.socialPaymentComBaseString,jdbcType=VARCHAR}, #{item.socialSchemeId,jdbcType=DOUBLE}, #{item.createTime,jdbcType=DATE}, #{item.socialEndTime,jdbcType=VARCHAR}, @@ -206,6 +210,7 @@ welfare_type, delete_type, social_payment_base_string, + social_payment_com_base_string, social_scheme_id, create_time, social_end_time, @@ -223,6 +228,7 @@ #{item.welfareType}, #{item.deleteType}, #{item.socialPaymentBaseString}, + #{item.socialPaymentComBaseString}, #{item.socialSchemeId}, #{item.createTime}, #{item.socialEndTime}, diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 11299554e..8738c66f9 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -20,6 +20,7 @@ import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.sicategory.DeleteTypeEnum; import com.engine.salary.enums.sicategory.NonPaymentEnum; +import com.engine.salary.enums.sicategory.PaymentScopeEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.enums.taxagent.TaxAgentEmpChangeModuleEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -1158,6 +1159,19 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService public PageInfo historyListByEmployeeIdAndOperator(SIArchiveBaseHistoryListParam param) { List adjustHistoryDTOS = siArchivesBiz.getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); + adjustHistoryDTOS.forEach(f -> { + if (StringUtils.isNotBlank(f.getPaymentScope())) { + if(f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_PERSON.getValue().toString())) { + f.setPaymentScope(SalaryI18nUtil.getI18nLabel(0, "个人")); + } else if(f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_COMPANY.getValue().toString())) { + f.setPaymentScope(SalaryI18nUtil.getI18nLabel(0, "公司")); + } else { + f.setPaymentScope(SalaryI18nUtil.getI18nLabel(0, "个人") + "," + SalaryI18nUtil.getI18nLabel(0, "公司")); + } + } else { + f.setPaymentScope(SalaryI18nUtil.getI18nLabel(0, "个人") + "," + SalaryI18nUtil.getI18nLabel(0, "公司")); + } + }); PageInfo listPage = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), adjustHistoryDTOS , InsuranceArchivesBaseHistoryDTO.class); diff --git a/src/com/engine/salary/service/impl/SIImportServiceImpl.java b/src/com/engine/salary/service/impl/SIImportServiceImpl.java index 8fc7eccdb..c8b41704c 100644 --- a/src/com/engine/salary/service/impl/SIImportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIImportServiceImpl.java @@ -27,6 +27,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelComment; import com.engine.salary.util.excel.ExcelUtil; +import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; @@ -184,7 +185,7 @@ public class SIImportServiceImpl extends Service implements SIImportService { //工作簿数据 - return ExcelUtil.genWorkbookV2(excelSheetData, sheetName,excelComments); + return ExcelUtilPlus.genWorkbookV2(excelSheetData, sheetName,excelComments); } @@ -194,6 +195,7 @@ public class SIImportServiceImpl extends Service implements SIImportService { * @return */ public List buildHeader() { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); List result = new ArrayList<>(); result.add(SalaryI18nUtil.getI18nLabel( 85429, "姓名")); result.add(SalaryI18nUtil.getI18nLabel( 86184, "个税扣缴义务人")); @@ -206,7 +208,13 @@ public class SIImportServiceImpl extends Service implements SIImportService { // result.add(SalaryI18nUtil.getI18nLabel( 91325, "社保缴纳组织")); //社保福利基数 Map socialMap = welfareNameIdMap( WelfareTypeEnum.SOCIAL_SECURITY); - socialMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 100293, "申报基数"))); + if (welBaseDiffSign) { + socialMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"))); + socialMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"))); + } else { + socialMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数"))); + } + result.add(SalaryI18nUtil.getI18nLabel( 91324, "社保账号")); result.add(SalaryI18nUtil.getI18nLabel( 91319, "社保起始缴纳月")); result.add(SalaryI18nUtil.getI18nLabel( 91320, "社保最后缴纳月")); @@ -215,7 +223,13 @@ public class SIImportServiceImpl extends Service implements SIImportService { result.add(SalaryI18nUtil.getI18nLabel( 91486, "公积金账号")); //公积金福利基数 Map fundMap = welfareNameIdMap( WelfareTypeEnum.ACCUMULATION_FUND); - fundMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 100293, "申报基数"))); + if (welBaseDiffSign) { + fundMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"))); + fundMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"))); + } else { + fundMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数"))); + } + result.add(SalaryI18nUtil.getI18nLabel( 91487, "补充公积金账号")); result.add(SalaryI18nUtil.getI18nLabel( 91483, "公积金起始缴纳月")); result.add(SalaryI18nUtil.getI18nLabel( 91484, "公积金最后缴纳月")); @@ -223,7 +237,13 @@ public class SIImportServiceImpl extends Service implements SIImportService { // result.add(SalaryI18nUtil.getI18nLabel( 91497, "其他福利缴纳组织")); //其他福利基数 Map otherMap = welfareNameIdMap( WelfareTypeEnum.OTHER); - otherMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 100293, "申报基数"))); + if (welBaseDiffSign) { + otherMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"))); + otherMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"))); + } else { + otherMap.forEach((k, v) -> result.add(k + SalaryI18nUtil.getI18nLabel( 0, "申报基数"))); + } + result.add(SalaryI18nUtil.getI18nLabel( 91490, "其他福利起始缴纳月")); result.add(SalaryI18nUtil.getI18nLabel( 91494, "其他福利最后缴纳月")); return result; diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index d49f971e2..295fd5615 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -1084,16 +1084,40 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesOtherSchemePO = buildOtherPO(employeeId, welfareMap, singleAccount, schemeNameIdMap, paymentNameIdMap, creator); } /**************校验申报基数**************/ - for (Map.Entry entry : welfareMap.entrySet()) { - String keyName = entry.getValue() + SalaryI18nUtil.getI18nLabel(100293, "申报基数"); - String numberVlue = findElement(singleAccount, keyName).get(keyName) == null ? "" : findElement(singleAccount, keyName).get(keyName).toString(); - if (!"".equals(numberVlue) && !NumberUtils.isParsable(numberVlue)) { - Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + keyName + SalaryI18nUtil.getI18nLabel(100581, "请输入数字")); - excelComments.add(errorMessageMap); - isError = true; + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + if (welBaseDiffSign) { + for (Map.Entry entry : welfareMap.entrySet()) { + String keyPerName = entry.getValue() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"); + String keyComName = entry.getValue() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"); + String numberPerValue = findElement(singleAccount, keyPerName).get(keyPerName) == null ? "" : findElement(singleAccount, keyPerName).get(keyPerName).toString(); + String numberComValue = findElement(singleAccount, keyComName).get(keyComName) == null ? "" : findElement(singleAccount, keyComName).get(keyComName).toString(); + + if (!"".equals(numberPerValue) && !NumberUtils.isParsable(numberPerValue)) { + Map errorMessageMap = Maps.newHashMap(); + errorMessageMap.put("message", rowIndex + keyPerName + SalaryI18nUtil.getI18nLabel(0, "请输入数字")); + excelComments.add(errorMessageMap); + isError = true; + } + if (!"".equals(numberComValue) && !NumberUtils.isParsable(numberComValue)) { + Map errorMessageMap = Maps.newHashMap(); + errorMessageMap.put("message", rowIndex + keyComName + SalaryI18nUtil.getI18nLabel(0, "请输入数字")); + excelComments.add(errorMessageMap); + isError = true; + } + } + } else { + for (Map.Entry entry : welfareMap.entrySet()) { + String keyName = entry.getValue() + SalaryI18nUtil.getI18nLabel(0, "申报基数"); + String numberValue = findElement(singleAccount, keyName).get(keyName) == null ? "" : findElement(singleAccount, keyName).get(keyName).toString(); + if (!"".equals(numberValue) && !NumberUtils.isParsable(numberValue)) { + Map errorMessageMap = Maps.newHashMap(); + errorMessageMap.put("message", rowIndex + keyName + SalaryI18nUtil.getI18nLabel(0, "请输入数字")); + excelComments.add(errorMessageMap); + isError = true; + } } } + //生成福利档案基础信息数据 InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = buildBaseInfoPO(employeeId, singleAccount, paymentNameIdMap, creator, runStatus, employees.get(0).isExtEmp()); if (!isError) { @@ -1108,17 +1132,25 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { Boolean otherCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - if (socialCheckBase && fundCheckBase && otherCheckBase) { + Boolean socialCheckComBase = true; + Boolean fundCheckComBase = true; + Boolean otherCheckComBase = true; + if (welBaseDiffSign) { + socialCheckComBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundCheckComBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherCheckComBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + } + if (socialCheckBase && fundCheckBase && otherCheckBase && socialCheckComBase && fundCheckComBase && otherCheckComBase) { insuranceArchivesAccountPOS.add(insuranceArchivesAccountPO); } else { String checkMessage = "该条数据中"; - if (!socialCheckBase) { + if (!socialCheckBase || !socialCheckComBase) { checkMessage = checkMessage + "社保福利基数、"; } - if (!fundCheckBase) { + if (!fundCheckBase || !fundCheckComBase) { checkMessage = checkMessage + "公积金福利基数、"; } - if (!otherCheckBase) { + if (!otherCheckBase || !otherCheckComBase) { checkMessage = checkMessage + "其他福利基数、"; } checkMessage = checkMessage.substring(0, checkMessage.length() - 1); @@ -1162,12 +1194,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { String socialAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91324, "社保账号")).get(SalaryI18nUtil.getI18nLabel(91324, "社保账号")); Long socialSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")).get(SalaryI18nUtil.getI18nLabel(91323, "社保方案名称"))); HashMap oldSocialBaseMap = new HashMap<>(); + HashMap oldSocialComBaseMap = new HashMap<>(); if (oldSocialSchemeInfos.size() > 0) { oldSocialSchemePO = oldSocialSchemeInfos.get(0); encryptUtil.decrypt(oldSocialSchemePO, InsuranceArchivesSocialSchemePO.class); BeanUtils.copyProperties(oldSocialSchemePO, insuranceArchivesSocialSchemePO); //社保基数 oldSocialBaseMap = JSON.parseObject(oldSocialSchemePO.getSocialPaymentBaseString(), new HashMap().getClass()); + oldSocialComBaseMap = JSON.parseObject(oldSocialSchemePO.getSocialPaymentComBaseString(), new HashMap().getClass()); } insuranceArchivesSocialSchemePO.setId(IdGenerator.generate()); @@ -1202,21 +1236,48 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesSocialSchemePO.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue()); List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesSocialSchemePO.getSocialSchemeId()); encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); HashMap socialPaymentBase = new HashMap<>(); + HashMap socialPaymentComBase = new HashMap<>(); for (Long insuranceId : insuranceIds) { if (StringUtils.isBlank(welfareMap.get(insuranceId))) { continue; } - if (findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")) != null) { - String itemValue = (String) findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")).get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - if (StringUtils.isNotBlank(itemValue)) { - socialPaymentBase.put(String.valueOf(insuranceId), itemValue); - } else if (oldSocialBaseMap != null && StringUtils.isNotBlank(oldSocialBaseMap.get(String.valueOf(insuranceId)))) { - socialPaymentBase.put(String.valueOf(insuranceId), oldSocialBaseMap.get(String.valueOf(insuranceId))); + if (welBaseDiffSign) { + Map itemPerMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人")); + if (itemPerMap != null) { + String itemValue = (String) itemPerMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人")); + if (StringUtils.isNotBlank(itemValue)) { + socialPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldSocialBaseMap != null && StringUtils.isNotBlank(oldSocialBaseMap.get(String.valueOf(insuranceId)))) { + socialPaymentBase.put(String.valueOf(insuranceId), oldSocialBaseMap.get(String.valueOf(insuranceId))); + } + } + Map itemComMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位")); + if (itemComMap != null) { + String itemValue = (String) itemComMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位")); + if (StringUtils.isNotBlank(itemValue)) { + socialPaymentComBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldSocialComBaseMap != null && StringUtils.isNotBlank(oldSocialComBaseMap.get(String.valueOf(insuranceId)))) { + socialPaymentComBase.put(String.valueOf(insuranceId), oldSocialComBaseMap.get(String.valueOf(insuranceId))); + } + } + insuranceArchivesSocialSchemePO.setSocialPaymentComBaseString(JSON.toJSONString(socialPaymentComBase)); + } else { + Map itemMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + if (itemMap != null) { + String itemValue = (String) itemMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + if (StringUtils.isNotBlank(itemValue)) { + socialPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldSocialBaseMap != null && StringUtils.isNotBlank(oldSocialBaseMap.get(String.valueOf(insuranceId)))) { + socialPaymentBase.put(String.valueOf(insuranceId), oldSocialBaseMap.get(String.valueOf(insuranceId))); + } } } + } insuranceArchivesSocialSchemePO.setSocialPaymentBaseString(JSON.toJSONString(socialPaymentBase)); } @@ -1243,12 +1304,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { String supplementFundAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")).get(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")); Long fundSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")).get(SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称"))); HashMap oldFundBaseMap = new HashMap<>(); + HashMap oldFundComBaseMap = new HashMap<>(); if (oldFundSchemeInfos.size() > 0) { oldFundSchemePO = oldFundSchemeInfos.get(0); encryptUtil.decrypt(oldFundSchemePO, InsuranceArchivesFundSchemePO.class); BeanUtils.copyProperties(oldFundSchemePO, insuranceArchivesFundSchemePO); //社保基数 oldFundBaseMap = JSON.parseObject(oldFundSchemePO.getFundPaymentBaseString(), new HashMap().getClass()); + oldFundComBaseMap = JSON.parseObject(oldFundSchemePO.getFundPaymentComBaseString(), new HashMap().getClass()); } insuranceArchivesFundSchemePO.setId(IdGenerator.generate()); @@ -1286,24 +1349,49 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesFundSchemePO.getFundSchemeId()); encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); - HashMap socialPaymentBase = new HashMap<>(); + HashMap fundPaymentBase = new HashMap<>(); + HashMap fundPaymentComBase = new HashMap<>(); for (Long insuranceId : insuranceIds) { if (StringUtils.isBlank(welfareMap.get(insuranceId))) { continue; } - if (findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")) != null) { - String itemValue = (String) findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")).get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - if (StringUtils.isNotBlank(itemValue)) { - socialPaymentBase.put(String.valueOf(insuranceId), itemValue); - } else if (oldFundBaseMap != null && StringUtils.isNotBlank(oldFundBaseMap.get(String.valueOf(insuranceId)))) { - socialPaymentBase.put(String.valueOf(insuranceId), oldFundBaseMap.get(String.valueOf(insuranceId))); + if (welBaseDiffSign) { + Map itemPerMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人")); + if (itemPerMap != null) { + String itemValue = (String) itemPerMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人")); + if (StringUtils.isNotBlank(itemValue)) { + fundPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldFundBaseMap != null && StringUtils.isNotBlank(oldFundBaseMap.get(String.valueOf(insuranceId)))) { + fundPaymentBase.put(String.valueOf(insuranceId), oldFundBaseMap.get(String.valueOf(insuranceId))); + } + } + Map itemComMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位")); + if (itemComMap != null) { + String itemValue = (String) itemComMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位")); + if (StringUtils.isNotBlank(itemValue)) { + fundPaymentComBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldFundComBaseMap != null && StringUtils.isNotBlank(oldFundComBaseMap.get(String.valueOf(insuranceId)))) { + fundPaymentComBase.put(String.valueOf(insuranceId), oldFundComBaseMap.get(String.valueOf(insuranceId))); + } + } + insuranceArchivesFundSchemePO.setFundPaymentComBaseString(JSON.toJSONString(fundPaymentComBase)); + } else { + Map itemMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + if (itemMap != null) { + String itemValue = (String) itemMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + if (StringUtils.isNotBlank(itemValue)) { + fundPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldFundBaseMap != null && StringUtils.isNotBlank(oldFundBaseMap.get(String.valueOf(insuranceId)))) { + fundPaymentBase.put(String.valueOf(insuranceId), oldFundBaseMap.get(String.valueOf(insuranceId))); + } } - } + } - insuranceArchivesFundSchemePO.setFundPaymentBaseString(JSON.toJSONString(socialPaymentBase)); + insuranceArchivesFundSchemePO.setFundPaymentBaseString(JSON.toJSONString(fundPaymentBase)); } return insuranceArchivesFundSchemePO; } @@ -1325,12 +1413,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //设置其他福利方案、起始缴纳月、最后缴纳月 Long otherSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")).get(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"))); HashMap oldOtherBaseMap = new HashMap<>(); + HashMap oldOtherComBaseMap = new HashMap<>(); if (oldOtherSchemeInfos.size() > 0) { oldOtherSchemePO = oldOtherSchemeInfos.get(0); encryptUtil.decrypt(oldOtherSchemePO, InsuranceArchivesOtherSchemePO.class); BeanUtils.copyProperties(oldOtherSchemePO, insuranceArchivesOtherSchemePO); //社保基数 oldOtherBaseMap = JSON.parseObject(oldOtherSchemePO.getOtherPaymentBaseString(), new HashMap().getClass()); + oldOtherComBaseMap = JSON.parseObject(oldOtherSchemePO.getOtherPaymentComBaseString(), new HashMap().getClass()); } insuranceArchivesOtherSchemePO.setId(IdGenerator.generate()); @@ -1361,24 +1451,49 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesOtherSchemePO.setEmployeeId(employeeId); List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesOtherSchemePO.getOtherSchemeId()); encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); - HashMap socialPaymentBase = new HashMap<>(); + HashMap otherPaymentBase = new HashMap<>(); + HashMap otherPaymentComBase = new HashMap<>(); for (Long insuranceId : insuranceIds) { if (StringUtils.isBlank(welfareMap.get(insuranceId))) { continue; } - if (findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")) != null) { - String itemValue = (String) findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")).get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - if (StringUtils.isNotBlank(itemValue)) { - socialPaymentBase.put(String.valueOf(insuranceId), itemValue); - } else if (oldOtherBaseMap != null && StringUtils.isNotBlank(oldOtherBaseMap.get(String.valueOf(insuranceId)))) { - socialPaymentBase.put(String.valueOf(insuranceId), oldOtherBaseMap.get(String.valueOf(insuranceId))); + if (welBaseDiffSign) { + Map itemPerMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人")); + if (itemPerMap != null) { + String itemValue = (String) itemPerMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人")); + if (StringUtils.isNotBlank(itemValue)) { + otherPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldOtherBaseMap != null && StringUtils.isNotBlank(oldOtherBaseMap.get(String.valueOf(insuranceId)))) { + otherPaymentBase.put(String.valueOf(insuranceId), oldOtherBaseMap.get(String.valueOf(insuranceId))); + } + } + Map itemComMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位")); + if (itemComMap != null) { + String itemValue = (String) itemComMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位")); + if (StringUtils.isNotBlank(itemValue)) { + otherPaymentComBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldOtherComBaseMap != null && StringUtils.isNotBlank(oldOtherComBaseMap.get(String.valueOf(insuranceId)))) { + otherPaymentComBase.put(String.valueOf(insuranceId), oldOtherComBaseMap.get(String.valueOf(insuranceId))); + } + } + insuranceArchivesOtherSchemePO.setOtherPaymentComBaseString(JSON.toJSONString(otherPaymentComBase)); + } else { + Map itemMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + if (itemMap != null) { + String itemValue = (String) itemMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + if (StringUtils.isNotBlank(itemValue)) { + otherPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldOtherBaseMap != null && StringUtils.isNotBlank(oldOtherBaseMap.get(String.valueOf(insuranceId)))) { + otherPaymentBase.put(String.valueOf(insuranceId), oldOtherBaseMap.get(String.valueOf(insuranceId))); + } } - } + } - insuranceArchivesOtherSchemePO.setOtherPaymentBaseString(JSON.toJSONString(socialPaymentBase)); + insuranceArchivesOtherSchemePO.setOtherPaymentBaseString(JSON.toJSONString(otherPaymentBase)); } return insuranceArchivesOtherSchemePO; } From bb1b785f55e432d08fe5014c2ee7ff54d3067a2c Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 7 Dec 2023 11:06:19 +0800 Subject: [PATCH 008/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E5=9F=BA=E6=95=B0=E9=80=BB=E8=BE=91=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 35 +-- .../service/impl/SISchemeServiceImpl.java | 259 ++++++++++++++---- 2 files changed, 212 insertions(+), 82 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index fbf526ca6..32186cbbb 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1520,26 +1520,22 @@ public class SIArchivesBiz { socialCollect.putAll(customSocial); socialCollect.putAll(sysSocial); -// socialSet.forEach(item -> { -// if (socialCollect.containsKey(Long.valueOf(item))) { -// socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); -// } -// }); + if (welBaseDiffSign) { socialSet.forEach(item -> { if (socialCollect.containsKey(Long.valueOf(item))) { - socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "个人"); + socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); } }); socialComSet.forEach(item -> { if (socialCollect.containsKey(Long.valueOf(item))) { - socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "单位"); + socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); } }); } else { socialSet.forEach(item -> { if (socialCollect.containsKey(Long.valueOf(item))) { - socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); + socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); } }); } @@ -1550,26 +1546,21 @@ public class SIArchivesBiz { Map sysFund = iCategoryMapper.listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); fundCollect.putAll(customFund); fundCollect.putAll(sysFund); -// fundSet.forEach(item -> { -// if (fundCollect.containsKey(Long.valueOf(item))) { -// fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); -// } -// }); if (welBaseDiffSign) { fundSet.forEach(item -> { if (fundCollect.containsKey(Long.valueOf(item))) { - fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "个人"); + fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); } }); fundComSet.forEach(item -> { if (fundCollect.containsKey(Long.valueOf(item))) { - fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "单位"); + fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); } }); } else { fundSet.forEach(item -> { if (fundCollect.containsKey(Long.valueOf(item))) { - fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); + fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); } }); } @@ -1580,26 +1571,22 @@ public class SIArchivesBiz { Map sysOther = iCategoryMapper.listByWelfareType(WelfareTypeEnum.OTHER.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); otherCollect.putAll(customOther); otherCollect.putAll(sysOther); -// otherSet.forEach(item -> { -// if (otherCollect.containsKey(Long.valueOf(item))) { -// otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); -// } -// }); + if (welBaseDiffSign) { otherSet.forEach(item -> { if (otherCollect.containsKey(Long.valueOf(item))) { - otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "个人"); + otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); } }); otherComSet.forEach(item -> { if (otherCollect.containsKey(Long.valueOf(item))) { - otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数" + "单位"); + otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); } }); } else { otherSet.forEach(item -> { if (otherCollect.containsKey(Long.valueOf(item))) { - otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + "申报基数"); + otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); } }); } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 295fd5615..5b2552ef9 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -51,6 +51,7 @@ import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtil; +import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; @@ -261,6 +262,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { @Override public List> buildTableData(List insuranceArchivesEmployeePOS) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); List> records = new ArrayList<>(); List taxAgentPOS = getTaxAgentMapper().listAll(); Map longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId); @@ -286,9 +288,6 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { Map fundSchemePOMap = SalaryEntityUtil.convert2Map(fundList, k -> k.getPaymentOrganization() + "-" + k.getEmployeeId()); Map otherSchemePOMap = SalaryEntityUtil.convert2Map(otherList, k -> k.getPaymentOrganization() + "-" + k.getEmployeeId()); -// Map socialSchemePOMap = socialList.stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getEmployeeId, Function.identity())); -// Map fundSchemePOMap = fundList.stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getEmployeeId, Function.identity())); -// Map otherSchemePOMap = otherList.stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getEmployeeId, Function.identity())); insuranceArchivesEmployeePOS.forEach(item -> { InsuranceArchivesSocialSchemePO socialItem = socialSchemePOMap.get(item.getPaymentOrganization() + "-" + item.getEmployeeId()); InsuranceArchivesFundSchemePO fundItem = fundSchemePOMap.get(item.getPaymentOrganization() + "-" + item.getEmployeeId()); @@ -307,15 +306,37 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { map.put("socialName", getSiSchemeService().querySchemeName(socialItem.getSocialSchemeId())); Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { }); - if (socialJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId()); - socialJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } + if (welBaseDiffSign) { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map socialComJson = JSON.parseObject(socialItem.getSocialPaymentComBaseString(), new TypeReference>() { }); -// map.putAll(socialJson); + if (socialComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + socialComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } } map.put("socialAccount", socialItem.getSocialAccount()); map.put("socialStartTime", socialItem.getSocialStartTime()); @@ -326,15 +347,37 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { map.put("fundAccount", fundItem.getFundAccount()); Map fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference>() { }); - if (fundJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId()); - fundJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } + if (welBaseDiffSign) { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map fundComJson = JSON.parseObject(fundItem.getFundPaymentComBaseString(), new TypeReference>() { }); -// map.putAll(fundJson); + if (fundComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } } map.put("supplementFundAccount", fundItem.getSupplementFundAccount()); map.put("fundStartTime", fundItem.getFundStartTime()); @@ -345,15 +388,37 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { map.put("otherName", getSiSchemeService().querySchemeName(otherItem.getOtherSchemeId())); Map otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference>() { }); - if (otherJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId()); - otherJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } + if (welBaseDiffSign) { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map otherComJson = JSON.parseObject(otherItem.getOtherPaymentComBaseString(), new TypeReference>() { }); -// map.putAll(otherJson); + if (otherComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } } map.put("otherStartTime", otherItem.getOtherStartTime()); map.put("otherEndTime", otherItem.getOtherEndTime()); @@ -422,11 +487,11 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } //工作簿数据 - List> rows = new LinkedList<>(); - List collect = columns.stream().map(WeaTableColumn::getText).collect(Collectors.toList()); + List> rows = new LinkedList<>(); + List collect = columns.stream().map(WeaTableColumn::getText).collect(Collectors.toList()); rows.add(collect); for (Map recordData : records) { - List row = new LinkedList<>(); + List row = new LinkedList<>(); for (WeaTableColumn column : columns) { try { Object o = recordData.get(column.getColumn()); @@ -437,20 +502,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } rows.add(row); } -// return salaryBatchService.simpleExportExcel(ExportExcelInfo.builder() -// .bizId(exportMap.get("biz")) -// .flag(true) -// .userId(employeeId) -// .eteamsId(eteamsId) -// .tenantKey(tenantKey) -// .operator(operator) -// .module(exportMap.get("module")) -// .fileName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 94629, "社保福利档案") + SalaryDateUtil.getFormatLocalDateTime(LocalDateTime.now())) -// .handlerName("insuranceArchivesExportHandler") -// .dataType(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 99915, "档案")) -// .function(exportMap.get("function")).build(), sheetList); //获取excel - return ExcelUtil.genWorkbook(rows, sheetName); + return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } @@ -532,10 +585,17 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { public Map> buildColumnTitle(List insuranceArchivesEmployeePOS, Long employeeId) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + Map> result = new HashMap<>(); Set socialSet = new HashSet<>(); Set fundSet = new HashSet<>(); Set otherSet = new HashSet<>(); + + Set socialComSet = new HashSet<>(); + Set fundComSet = new HashSet<>(); + Set otherComSet = new HashSet<>(); + insuranceArchivesEmployeePOS.forEach(item -> { List socialByEmployeeId = siArchivesBiz.getSocialByEmployeeIds(new ArrayList() {{ add(item.getEmployeeId()); @@ -571,6 +631,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (socialJson != null) { socialJson.forEach((k, v) -> socialSet.add(k)); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map socialComJson = JSON.parseObject(socialItem.getSocialPaymentComBaseString(), new TypeReference>() { + }); + if (socialComJson != null) { + socialComJson.forEach((k, v) -> socialComSet.add(k)); + } + } } if (fundItem != null) { Map fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference>() { @@ -578,6 +646,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (fundJson != null) { fundJson.forEach((k, v) -> fundSet.add(k)); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map fundComJson = JSON.parseObject(fundItem.getFundPaymentComBaseString(), new TypeReference>() { + }); + if (fundComJson != null) { + fundComJson.forEach((k, v) -> fundComSet.add(k)); + } + } } if (otherItem != null) { Map otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference>() { @@ -585,42 +661,92 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (otherJson != null) { otherJson.forEach((k, v) -> otherSet.add(k)); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map otherComJson = JSON.parseObject(otherItem.getOtherPaymentComBaseString(), new TypeReference>() { + }); + if (otherComJson != null) { + otherComJson.forEach((k, v) -> otherComSet.add(k)); + } + } } }); Map socialMap = new HashMap<>(); + Map socialComMap = new HashMap<>(); Map socialCollect = new HashMap<>(); Map customSocial = getICategoryMapper().listByWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), null).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); Map sysSocial = getICategoryMapper().listByWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); socialCollect.putAll(customSocial); socialCollect.putAll(sysSocial); - socialSet.forEach(item -> { - if (socialCollect.containsKey(Long.valueOf(item))) { - socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - } - }); + if (welBaseDiffSign) { + socialSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + }); + socialComSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + }); + } else { + socialSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } + }); + } Map fundMap = new HashMap<>(); + Map fundComMap = new HashMap<>(); Map fundCollect = new HashMap<>(); Map customFund = getICategoryMapper().listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), null).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); Map sysFund = getICategoryMapper().listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); fundCollect.putAll(customFund); fundCollect.putAll(sysFund); - fundSet.forEach(item -> { - if (fundCollect.containsKey(Long.valueOf(item))) { - fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - } - }); + if (welBaseDiffSign) { + fundSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + }); + fundComSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + }); + } else { + fundSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } + }); + } Map otherMap = new HashMap<>(); + Map otherComMap = new HashMap<>(); Map otherCollect = new HashMap<>(); Map customOther = getICategoryMapper().listByWelfareType(WelfareTypeEnum.OTHER.getValue(), null).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); Map sysOther = getICategoryMapper().listByWelfareType(WelfareTypeEnum.OTHER.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); otherCollect.putAll(customOther); otherCollect.putAll(sysOther); - otherSet.forEach(item -> { - if (otherCollect.containsKey(Long.valueOf(item))) { - otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - } - }); + if (welBaseDiffSign) { + otherSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + }); + otherComSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + }); + } else { + otherSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } + }); + } // map根据key排序 LinkedHashMap socialMapWithAscKey = socialMap.entrySet().stream() @@ -635,6 +761,23 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { .sorted(Map.Entry.comparingByKey()) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)); + if (welBaseDiffSign) { + LinkedHashMap socialComMapWithAscKey = socialComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap fundComMapWithAscKey = fundComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap otherComMapWithAscKey = otherComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + socialMapWithAscKey.putAll(socialComMapWithAscKey); + fundMapWithAscKey.putAll(fundComMapWithAscKey); + otherMapWithAscKey.putAll(otherComMapWithAscKey); + } result.put(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), socialMapWithAscKey); result.put(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), fundMapWithAscKey); From 1c5249c76e1bf3aac4f4ed3096863eda22aa819c Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 8 Dec 2023 11:16:18 +0800 Subject: [PATCH 009/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E3=80=81=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=8B=86=E5=88=86=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8=E5=9F=BA=E6=95=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIAccountBiz.java | 80 +++++- .../bo/InsuranceComparisonResultBO.java | 81 +++++- .../siaccount/po/ExcelInsuranceDetailPO.java | 18 ++ .../po/InsuranceAccountDetailTempPO.java | 18 ++ .../InsuranceAccountDetailMapper.xml | 36 ++- .../siaccount/SIAccountDetailTempMapper.xml | 30 ++- .../service/impl/ColumnBuildServiceImpl.java | 127 +++++++-- .../service/impl/RecordsBuildServiceImpl.java | 129 ++++++++- .../impl/SIAComparisonResultServiceImpl.java | 8 +- .../service/impl/SIAccountServiceImpl.java | 54 +++- .../service/impl/SIExportServiceImpl.java | 250 +++++++++++++++--- .../service/impl/SIRecessionServiceImpl.java | 3 + .../salary/web/SIAccountController.java | 4 +- 13 files changed, 730 insertions(+), 108 deletions(-) diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 34b6aae17..c6df56a19 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -631,11 +631,13 @@ public class SIAccountBiz extends Service { } public InsuranceAccountDetailPO accountOther(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth, String tenantKey) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (accountPO.getOther() != null) { InsuranceArchivesOtherSchemePO otherPO = accountPO.getOther(); insuranceAccountDetailPO.setOtherPayOrg(otherPO.getPaymentOrganization()); insuranceAccountDetailPO.setOtherSchemeId(otherPO.getOtherSchemeId()); insuranceAccountDetailPO.setOtherPaymentBaseString(otherPO.getOtherPaymentBaseString()); + insuranceAccountDetailPO.setOtherPaymentComBaseString(otherPO.getOtherPaymentComBaseString()); //判断是否在起始缴纳月和最后缴纳月之间 Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), otherPO.getOtherStartTime(), otherPO.getOtherEndTime()); if ((Objects.equals(NonPaymentEnum.YES.getValue(), otherPO.getNonPayment()) || otherPO.getNonPayment() == null) && otherPO.getOtherSchemeId() != null && inDataRange) { @@ -719,7 +721,13 @@ public class SIAccountBiz extends Service { .collect( Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); //档案中包含的基数信息 - HashMap archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); +// HashMap archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(otherPO.getOtherPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); + } //需要核算其他的福利id 单位 List needArchivesCom = new ArrayList<>(); if (archivesCom != null) { @@ -742,10 +750,11 @@ public class SIAccountBiz extends Service { List otherComList = new ArrayList<>(); Map otherComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; needArchivesCom.stream().forEach(e -> { InsuranceSchemeDetailPO po = otherCom.get(e); BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); - BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); @@ -787,6 +796,7 @@ public class SIAccountBiz extends Service { public InsuranceAccountDetailPO accountFund(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth, String tenantKey) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (accountPO.getFund() != null) { InsuranceArchivesFundSchemePO fundPO = accountPO.getFund(); insuranceAccountDetailPO.setFundPayOrg(fundPO.getPaymentOrganization()); @@ -794,6 +804,7 @@ public class SIAccountBiz extends Service { insuranceAccountDetailPO.setSupplementFundAccount(fundPO.getSupplementFundAccount()); insuranceAccountDetailPO.setFundSchemeId(fundPO.getFundSchemeId()); insuranceAccountDetailPO.setFundPaymentBaseString(fundPO.getFundPaymentBaseString()); + insuranceAccountDetailPO.setFundPaymentComBaseString(fundPO.getFundPaymentComBaseString()); //判断是否在起始缴纳月和最后缴纳月之间 Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), fundPO.getFundStartTime(), fundPO.getFundEndTime()); if ((NonPaymentEnum.YES.getValue() == fundPO.getNonPayment() || fundPO.getNonPayment() == null) && fundPO.getFundSchemeId() != null && inDataRange) { @@ -876,7 +887,13 @@ public class SIAccountBiz extends Service { .collect( Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); //档案中包含的基数信息 - HashMap archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); +// HashMap archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(fundPO.getFundPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); + } //需要核算公积金的福利id 单位 List needArchivesCom = new ArrayList<>(); if (archivesCom != null) { @@ -899,10 +916,11 @@ public class SIAccountBiz extends Service { List fundComList = new ArrayList<>(); Map fundComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; needArchivesCom.stream().forEach(e -> { InsuranceSchemeDetailPO po = fundCom.get(e); BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); - BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); @@ -945,12 +963,14 @@ public class SIAccountBiz extends Service { public InsuranceAccountDetailPO accountSocial(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth, String tenantKey) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (accountPO.getSocial() != null) { InsuranceArchivesSocialSchemePO socialPO = accountPO.getSocial(); insuranceAccountDetailPO.setSocialPayOrg(socialPO.getPaymentOrganization()); insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount()); insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId()); insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString()); + insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString()); //判断是否在起始缴纳月和最后缴纳月之间 Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), socialPO.getSocialStartTime(), socialPO.getSocialEndTime()); if ((NonPaymentEnum.YES.getValue().equals(socialPO.getNonPayment()) || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null && inDataRange) { @@ -1036,7 +1056,13 @@ public class SIAccountBiz extends Service { .collect( Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); //档案中包含的基数信息 - HashMap archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); +// HashMap archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(socialPO.getSocialPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + } //需要核算社保的福利id 单位 List needArchivesCom = new ArrayList<>(); if (archivesCom != null) { @@ -1059,10 +1085,11 @@ public class SIAccountBiz extends Service { List socialCom = new ArrayList<>(); Map sociaComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; needArchivesCom.stream().forEach(e -> { InsuranceSchemeDetailPO po = schemeCom.get(e); BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); - BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); @@ -1510,7 +1537,6 @@ public class SIAccountBiz extends Service { } else { accountFund(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); } - } if (projects.contains(ProjectTypeEnum.OTHER.getValue())) { @@ -1532,11 +1558,13 @@ public class SIAccountBiz extends Service { public InsuranceAccountDetailPO accountOther(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (accountPO.getOther() != null) { InsuranceArchivesOtherSchemePO otherPO = accountPO.getOther(); insuranceAccountDetailPO.setOtherPayOrg(otherPO.getPaymentOrganization()); insuranceAccountDetailPO.setOtherSchemeId(otherPO.getOtherSchemeId()); insuranceAccountDetailPO.setOtherPaymentBaseString(otherPO.getOtherPaymentBaseString()); + insuranceAccountDetailPO.setOtherPaymentComBaseString(otherPO.getOtherPaymentComBaseString()); //判断是否在起始缴纳月和最后缴纳月之间 Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, otherPO.getOtherStartTime(), otherPO.getOtherEndTime()); if ((Objects.equals(NonPaymentEnum.YES.getValue(), otherPO.getNonPayment()) || otherPO.getNonPayment() == null) && otherPO.getOtherSchemeId() != null && inDataRange) { @@ -1611,7 +1639,13 @@ public class SIAccountBiz extends Service { .collect( Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); //档案中包含的基数信息 - HashMap archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); +// HashMap archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(otherPO.getOtherPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); + } //需要核算其他的福利id 单位 List needArchivesCom = new ArrayList<>(); if (archivesCom != null) { @@ -1626,10 +1660,11 @@ public class SIAccountBiz extends Service { List otherComList = new ArrayList<>(); Map otherComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; needArchivesCom.stream().forEach(e -> { InsuranceSchemeDetailPO po = otherCom.get(e); BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); - BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); @@ -1671,6 +1706,7 @@ public class SIAccountBiz extends Service { } public InsuranceAccountDetailPO accountFund(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (accountPO.getFund() != null) { InsuranceArchivesFundSchemePO fundPO = accountPO.getFund(); insuranceAccountDetailPO.setFundPayOrg(fundPO.getPaymentOrganization()); @@ -1678,6 +1714,7 @@ public class SIAccountBiz extends Service { insuranceAccountDetailPO.setSupplementFundAccount(fundPO.getSupplementFundAccount()); insuranceAccountDetailPO.setFundSchemeId(fundPO.getFundSchemeId()); insuranceAccountDetailPO.setFundPaymentBaseString(fundPO.getFundPaymentBaseString()); + insuranceAccountDetailPO.setFundPaymentComBaseString(fundPO.getFundPaymentComBaseString()); //判断是否在起始缴纳月和最后缴纳月之间 Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, fundPO.getFundStartTime(), fundPO.getFundEndTime()); if ((Objects.equals(NonPaymentEnum.YES.getValue(), fundPO.getNonPayment()) || fundPO.getNonPayment() == null) && fundPO.getFundSchemeId() != null && inDataRange) { @@ -1751,7 +1788,13 @@ public class SIAccountBiz extends Service { .collect( Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); //档案中包含的基数信息 - HashMap archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); +// HashMap archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(fundPO.getFundPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); + } //需要核算公积金的福利id 单位 List needArchivesCom = new ArrayList<>(); if (archivesCom != null) { @@ -1766,10 +1809,11 @@ public class SIAccountBiz extends Service { List fundComList = new ArrayList<>(); Map fundComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; needArchivesCom.stream().forEach(e -> { InsuranceSchemeDetailPO po = fundCom.get(e); BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); - BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); @@ -1812,12 +1856,14 @@ public class SIAccountBiz extends Service { } public InsuranceAccountDetailPO accountSocial(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); if (accountPO.getSocial() != null) { InsuranceArchivesSocialSchemePO socialPO = accountPO.getSocial(); insuranceAccountDetailPO.setSocialPayOrg(socialPO.getPaymentOrganization()); insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount()); insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId()); insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString()); + insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString()); //判断是否在起始缴纳月和最后缴纳月之间 Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, socialPO.getSocialStartTime(), socialPO.getSocialEndTime()); if ((Objects.equals(NonPaymentEnum.YES.getValue(), socialPO.getNonPayment()) || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null && inDataRange) { @@ -1896,7 +1942,13 @@ public class SIAccountBiz extends Service { .collect( Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); //档案中包含的基数信息 - HashMap archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); +// HashMap archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(socialPO.getSocialPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + } //需要核算社保的福利id 单位 List needArchivesCom = new ArrayList<>(); if (archivesCom != null) { @@ -1911,10 +1963,11 @@ public class SIAccountBiz extends Service { List socialCom = new ArrayList<>(); Map sociaComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; needArchivesCom.stream().forEach(e -> { InsuranceSchemeDetailPO po = schemeCom.get(e); BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); - BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); @@ -1964,6 +2017,7 @@ public class SIAccountBiz extends Service { insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount()); insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId()); insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString()); + insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString()); //判断是否在起始缴纳月和最后缴纳月之间 Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, socialPO.getSocialStartTime(), socialPO.getSocialEndTime()); diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java index 6a85ddd20..79909c1e2 100644 --- a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java +++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java @@ -41,7 +41,7 @@ public class InsuranceComparisonResultBO { * 构建福利核算结果列表的表头（线下对比） * */ - public static List buildTableColumns4ComparisonResult(Set insuranceBaseSet, Set insurancePerPaySet, Set insuranceComPaySet) { + public static List buildTableColumns4ComparisonResult(Set insuranceBaseSet, Set insurancePerPaySet, Set insuranceComPaySet, boolean welBaseDiffSign) { List listAll = MapperProxyFactory.getProxy(ICategoryMapper.class).listAll(); List socialWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList()); @@ -67,21 +67,63 @@ public class InsuranceComparisonResultBO { columns.add(new Column("社保账号", "socialAccount", "socialAccount")); columns.add(new Column("社保方案名称", "socialSchemeName", "socialSchemeName")); //组装社保基数 - for (ICategoryPO po : socialWelfareList) { - columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "socialBase", po.getId() + "socialBase")); + if (welBaseDiffSign) { + List socialComColumns = Lists.newArrayList(); + for (ICategoryPO po : socialWelfareList) { + columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人") + , po.getId() + "socialPerBase", po.getId() + "socialPerBase")); + socialComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位") + , po.getId() + "socialComBase", po.getId() + "socialComBase")); + } + columns.addAll(socialComColumns); + } else { + for (ICategoryPO po : socialWelfareList) { + columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "socialBase", po.getId() + "socialBase")); + } } +// for (ICategoryPO po : socialWelfareList) { +// columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "socialBase", po.getId() + "socialBase")); +// } columns.add(new Column("公积金账号", "fundAccount", "fundAccount")); columns.add(new Column("公积金方案名称", "fundSchemeName", "fundSchemeName")); //组装公积金基数 - for (ICategoryPO po : fundWelfareList) { - columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "fundBase", po.getId() + "fundBase")); + if (welBaseDiffSign) { + List fundComColumns = Lists.newArrayList(); + for (ICategoryPO po : fundWelfareList) { + columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人") + , po.getId() + "fundPerBase", po.getId() + "fundPerBase")); + fundComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位") + , po.getId() + "fundComBase", po.getId() + "fundComBase")); + } + columns.addAll(fundComColumns); + } else { + for (ICategoryPO po : fundWelfareList) { + columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "fundBase", po.getId() + "fundBase")); + } } +// for (ICategoryPO po : fundWelfareList) { +// columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "fundBase", po.getId() + "fundBase")); +// } columns.add(new Column("补充公积金账号", "supplementFundAccount", "supplementFundAccount")); columns.add(new Column("其他福利方案名称", "otherSchemeName", "otherSchemeName")); //组装其他福利基数 - for (ICategoryPO po : otherWelfareList) { - columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "otherBase", po.getId() + "otherBase")); + if (welBaseDiffSign) { + List otherComColumns = Lists.newArrayList(); + for (ICategoryPO po : otherWelfareList) { + columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人") + , po.getId() + "otherPerBase", po.getId() + "otherPerBase")); + otherComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位") + , po.getId() + "otherComBase", po.getId() + "otherComBase")); + } + columns.addAll(otherComColumns); + } else { + for (ICategoryPO po : otherWelfareList) { + columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "otherBase", po.getId() + "otherBase")); + } } +// for (ICategoryPO po : otherWelfareList) { +// columns.add(new Column(po.getInsuranceName() + "申报基数", po.getId() + "otherBase", po.getId() + "otherBase")); +// } //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） for (ICategoryPO po : socialWelPerList) { @@ -127,7 +169,8 @@ public class InsuranceComparisonResultBO { * 构建福利核算线下对比结果 * */ - public static List> buildComparisonTableData(List accountExportPOS, List excelAccountExportPOS, Map schemeIdNameMap) { + public static List> buildComparisonTableData(List accountExportPOS, List excelAccountExportPOS + , Map schemeIdNameMap, boolean welBaseDiffSign) { Map> excelResultMap = SalaryEntityUtil.group2Map(excelAccountExportPOS, ExcelAccountExportPO::getEmployeeId); // Map> acctResultMap = SalaryEntityUtil.group2Map(accountExportPOS, AccountExportPO::getWorkcode); @@ -177,6 +220,28 @@ public class InsuranceComparisonResultBO { if (excelResultValueList != null && excelResultValueList.size() == 1) { excelAccountExportPO = excelResultValueList.get(0); } + if (welBaseDiffSign) { + //社保基数-个人，socialPaymentBaseString + welfareElementCompare(map, accountExportPO.getSocialPaymentBaseString(), excelAccountExportPO.getSocialPaymentBaseString(), "PerBase", 1); + //公积金基数-个人，fundPaymentBaseString + welfareElementCompare(map, accountExportPO.getFundPaymentBaseString(), excelAccountExportPO.getFundPaymentBaseString(), "PerBase", 2); + //其他福利基数-个人，otherPaymentBaseString + welfareElementCompare(map, accountExportPO.getOtherPaymentBaseString(), excelAccountExportPO.getOtherPaymentBaseString(), "PerBase", 3); + + //社保基数-公司，socialPaymentComBaseString + welfareElementCompare(map, accountExportPO.getSocialPaymentComBaseString(), excelAccountExportPO.getSocialPaymentComBaseString(), "ComBase", 1); + //公积金基数-公司，fundPaymentComBaseString + welfareElementCompare(map, accountExportPO.getFundPaymentComBaseString(), excelAccountExportPO.getFundPaymentComBaseString(), "ComBase", 2); + //其他福利基数-公司，otherPaymentComBaseString + welfareElementCompare(map, accountExportPO.getOtherPaymentComBaseString(), excelAccountExportPO.getOtherPaymentComBaseString(), "ComBase", 3); + } else { + //社保基数，socialPaymentBaseString + welfareElementCompare(map, accountExportPO.getSocialPaymentBaseString(), excelAccountExportPO.getSocialPaymentBaseString(), "Base", 1); + //公积金基数，fundPaymentBaseString + welfareElementCompare(map, accountExportPO.getFundPaymentBaseString(), excelAccountExportPO.getFundPaymentBaseString(), "Base", 2); + //其他福利基数，otherPaymentBaseString + welfareElementCompare(map, accountExportPO.getOtherPaymentBaseString(), excelAccountExportPO.getOtherPaymentBaseString(), "Base", 3); + } //社保基数，socialPaymentBaseString welfareElementCompare(map, accountExportPO.getSocialPaymentBaseString(), excelAccountExportPO.getSocialPaymentBaseString(), "Base", 1); //公积金基数，fundPaymentBaseString diff --git a/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java b/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java index 4e7889544..9660b8602 100644 --- a/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java +++ b/src/com/engine/salary/entity/siaccount/po/ExcelInsuranceDetailPO.java @@ -101,6 +101,12 @@ public class ExcelInsuranceDetailPO { @Encrypt private String socialPaymentBaseString; + /** + * 社保缴纳基数——单位 + */ + @Encrypt + private String socialPaymentComBaseString; + /** * 公积金方案ID */ @@ -112,6 +118,12 @@ public class ExcelInsuranceDetailPO { @Encrypt private String fundPaymentBaseString; + /** + * 公积金缴纳基数——单位 + */ + @Encrypt + private String fundPaymentComBaseString; + /** * 其他福利方案id */ @@ -123,6 +135,12 @@ public class ExcelInsuranceDetailPO { @Encrypt private String otherPaymentBaseString; + /** + * 其他福利缴纳基数——单位 + */ + @Encrypt + private String otherPaymentComBaseString; + /** * 社保个人缴费明细 */ diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java index 50897c6b2..dc8c1c2c0 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailTempPO.java @@ -102,6 +102,11 @@ public class InsuranceAccountDetailTempPO { @Encrypt private String socialPaymentBaseString; + /** + * 社保缴纳基数——单位 + */ + @Encrypt + private String socialPaymentComBaseString; /** * 公积金方案ID */ @@ -113,6 +118,12 @@ public class InsuranceAccountDetailTempPO { @Encrypt private String fundPaymentBaseString; + /** + * 公积金缴纳基数——单位 + */ + @Encrypt + private String fundPaymentComBaseString; + /** * 其他福利方案id */ @@ -124,6 +135,13 @@ public class InsuranceAccountDetailTempPO { @Encrypt private String otherPaymentBaseString; + /** + * 其他福利缴纳基数——单位 + */ + @Encrypt + private String otherPaymentComBaseString; + + /** * 社保个人缴费明细 */ diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 2e52ce986..925718b0b 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -18,10 +18,13 @@ + + + @@ -69,10 +72,13 @@ , t.other_pay_org , t.social_scheme_id , t.social_payment_base_string + , t.social_payment_com_base_string , t.fund_scheme_id , t.fund_payment_base_string + , t.fund_payment_com_base_string , t.other_scheme_id , t.other_payment_base_string + , t.other_payment_com_base_string , t.social_per_json , t.social_per_sum , t.fund_per_json @@ -117,10 +123,13 @@ , t.other_pay_org , t.social_scheme_id , t.social_payment_base_string + , t.social_payment_com_base_string , t.fund_scheme_id , t.fund_payment_base_string + , t.fund_payment_com_base_string , t.other_scheme_id , t.other_payment_base_string + , t.other_payment_com_base_string , t.social_per_json , t.social_per_sum , t.fund_per_json @@ -420,7 +429,8 @@ t.other_com_json,t.social_per_sum,t.social_com_sum, t.fund_per_sum,t.fund_com_sum,t.other_per_sum, t.other_com_sum,t.per_sum,t.com_sum,t.payment_organization, - t.social_payment_base_string, t.fund_payment_base_string, t.other_payment_base_string + t.social_payment_base_string, t.fund_payment_base_string, t.other_payment_base_string, + t.social_payment_com_base_string, t.fund_payment_com_base_string, t.other_payment_com_base_string FROM hrsa_bill_detail t WHERE t.delete_type = 0 @@ -711,7 +721,8 @@ (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) VALUES ( @@ -757,7 +768,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey}, - #{item.paymentOrganization} + #{item.paymentOrganization}, + #{item.socialPaymentComBaseString}, + #{item.fundPaymentComBaseString}, + #{item.otherPaymentComBaseString} ) @@ -766,7 +780,8 @@ (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) select #{item.employeeId,jdbcType=DOUBLE}, @@ -811,7 +826,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey,jdbcType=VARCHAR}, - #{item.paymentOrganization,jdbcType=DOUBLE} + #{item.paymentOrganization,jdbcType=DOUBLE}, + #{item.socialPaymentComBaseString,jdbcType=VARCHAR}, + #{item.fundPaymentComBaseString,jdbcType=VARCHAR}, + #{item.otherPaymentComBaseString,jdbcType=VARCHAR} from dual @@ -821,7 +839,8 @@ (employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) VALUES ( #{item.employeeId}, @@ -866,7 +885,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey}, - #{item.paymentOrganization} + #{item.paymentOrganization}, + #{item.socialPaymentComBaseString}, + #{item.fundPaymentComBaseString}, + #{item.otherPaymentComBaseString} ) diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml index f99461416..19b6fb3e5 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml @@ -18,10 +18,13 @@ + + + @@ -68,10 +71,13 @@ , t.other_pay_org , t.social_scheme_id , t.social_payment_base_string + , t.social_payment_com_base_string , t.fund_scheme_id , t.fund_payment_base_string + , t.fund_payment_com_base_string , t.other_scheme_id , t.other_payment_base_string + , t.other_payment_com_base_string , t.social_per_json , t.social_per_sum , t.fund_per_json @@ -130,7 +136,8 @@ (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) VALUES ( @@ -175,7 +182,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey}, - #{item.paymentOrganization} + #{item.paymentOrganization}, + #{item.socialPaymentComBaseString}, + #{item.fundPaymentComBaseString}, + #{item.otherPaymentComBaseString} ) @@ -184,7 +194,8 @@ (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) select @@ -229,7 +240,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey,jdbcType=VARCHAR}, - #{item.paymentOrganization,jdbcType=DOUBLE} + #{item.paymentOrganization,jdbcType=DOUBLE}, + #{item.socialPaymentComBaseString,jdbcType=VARCHAR}, + #{item.fundPaymentComBaseString,jdbcType=VARCHAR}, + #{item.otherPaymentComBaseString,jdbcType=VARCHAR} from dual @@ -239,7 +253,8 @@ (employee_id,bill_month,bill_status,payment_status,supplementary_month,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) VALUES ( #{item.employeeId}, @@ -283,7 +298,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey}, - #{item.paymentOrganization} + #{item.paymentOrganization}, + #{item.socialPaymentComBaseString}, + #{item.fundPaymentComBaseString}, + #{item.otherPaymentComBaseString} ) diff --git a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java index f15ae19f1..5312f1c51 100644 --- a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java @@ -1,6 +1,7 @@ package com.engine.salary.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.cloudstore.eccom.constant.WeaBoolAttr; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.core.impl.Service; @@ -31,6 +32,8 @@ import java.util.stream.Collectors; **/ public class ColumnBuildServiceImpl extends Service implements ColumnBuildService { + private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + private ICategoryMapper getICategoryMapper() { return MapperProxyFactory.getProxy(ICategoryMapper.class); } @@ -122,58 +125,128 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic } private Map> buildPaymentTitle(List pos, Map categoryIdNameMap, Long employeeId, String tenantKey) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); Set socailIds = new HashSet<>(); Set fundIds = new HashSet<>(); Set otherIds = new HashSet<>(); + + Set socailComIds = new HashSet<>(); + Set fundComIds = new HashSet<>(); + Set otherComIds = new HashSet<>(); + Map> result = new HashMap<>(); pos.stream().forEach(item -> { - if (StringUtils.isNotBlank(item.getSocialPaymentBaseString())) { + if (StringUtils.isNotBlank(item.getSocialPaymentBaseString()) || StringUtils.isNotBlank(item.getSocialPaymentComBaseString())) { Map socialJson = JSON.parseObject(item.getSocialPaymentBaseString(), new HashMap().getClass()); if(socialJson!=null){ socialJson.forEach((k, v) -> { socailIds.add(k); }); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map socialComJson = JSON.parseObject(item.getSocialPaymentComBaseString(), new TypeReference>() { + }); + if (socialComJson != null) { + socialComJson.forEach((k, v) -> socailComIds.add(k)); + } + } } - if (StringUtils.isNotBlank(item.getFundPaymentBaseString())) { + if (StringUtils.isNotBlank(item.getFundPaymentBaseString()) || StringUtils.isNotBlank(item.getFundPaymentComBaseString())) { Map fundJson = JSON.parseObject(item.getFundPaymentBaseString(), new HashMap().getClass()); if(fundJson!=null){ fundJson.forEach((k, v) -> { fundIds.add(k); }); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map fundComJson = JSON.parseObject(item.getFundPaymentComBaseString(), new TypeReference>() { + }); + if (fundComJson != null) { + fundComJson.forEach((k, v) -> fundComIds.add(k)); + } + } } - if (StringUtils.isNotBlank(item.getOtherPaymentBaseString())) { + if (StringUtils.isNotBlank(item.getOtherPaymentBaseString()) || StringUtils.isNotBlank(item.getOtherPaymentComBaseString())) { Map otherJson = JSON.parseObject(item.getOtherPaymentBaseString(), new HashMap().getClass()); if(otherJson!=null){ otherJson.forEach((k, v) -> { otherIds.add(k); }); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map otherComJson = JSON.parseObject(item.getOtherPaymentComBaseString(), new TypeReference>() { + }); + if (otherComJson != null) { + otherComJson.forEach((k, v) -> otherComIds.add(k)); + } + } } }); Map socialColumns = new HashMap<>(); Map fundColumns = new HashMap<>(); Map otherColumns = new HashMap<>(); - socailIds.stream().forEach(social -> { - if (categoryIdNameMap.containsKey(social)) { - socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(100293, "申报基数"), social + "socialBase"); - } - }); - fundIds.stream().forEach(social -> { - if (categoryIdNameMap.containsKey(social)) { - fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 100293, "申报基数"), social + "fundBase"); - } - }); - otherIds.stream().forEach(social -> { - if (categoryIdNameMap.containsKey(social)) { - otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 100293, "申报基数"), social + "otherBase"); - } - }); + + Map socialComColumns = new HashMap<>(); + Map fundComColumns = new HashMap<>(); + Map otherComColumns = new HashMap<>(); + + if (welBaseDiffSign) { + socailIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"), social + "socialPerBase"); + } + }); + fundIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"), social + "fundPerBase"); + } + }); + otherIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"), social + "otherPerBase"); + } + }); + + socailComIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + socialComColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"), social + "socialComBase"); + } + }); + fundComIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + fundComColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"), social + "fundComBase"); + } + }); + otherComIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + otherComColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"), social + "otherComBase"); + } + }); + } else { + socailIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), social + "socialBase"); + } + }); + fundIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数"), social + "fundBase"); + } + }); + otherIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数"), social + "otherBase"); + } + }); + } + // map根据value排序 LinkedHashMap socialColumnsWithAscValue = socialColumns.entrySet().stream() .sorted(Map.Entry.comparingByValue()) @@ -188,6 +261,24 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)); + if (welBaseDiffSign) { + LinkedHashMap socialComMapWithAscKey = socialComColumns.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap fundComMapWithAscKey = fundComColumns.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap otherComMapWithAscKey = otherComColumns.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + socialColumnsWithAscValue.putAll(socialComMapWithAscKey); + fundColumnsWithAscValue.putAll(fundComMapWithAscKey); + otherColumnsWithAscValue.putAll(otherComMapWithAscKey); + } + result.put(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), socialColumnsWithAscValue); result.put(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), fundColumnsWithAscValue); result.put(WelfareTypeEnum.OTHER.getValue(), otherColumnsWithAscValue); diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index 138eb8cf1..a18ca32e0 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -1,6 +1,7 @@ package com.engine.salary.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SIArchivesBiz; @@ -15,6 +16,7 @@ import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.siaccount.BillStatusEnum; import com.engine.salary.enums.siaccount.ResourceFromEnum; +import com.engine.salary.enums.sicategory.PaymentScopeEnum; import com.engine.salary.mapper.datacollection.EmployMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; @@ -60,8 +62,11 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); } + private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + @Override public List> buildCommonRecords(List list, Long employeeId) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); List> result = new ArrayList<>(); if (CollectionUtils.isEmpty(list)) { return result; @@ -99,34 +104,130 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ record.put("socialAccount", item.getSocialAccount()); record.put("socialSchemeName", getInsuranceSchemeMapper().querySchemeName(item.getSocialSchemeId())); - if (StringUtils.isNotEmpty(item.getSocialPaymentBaseString())) { + if (StringUtils.isNotEmpty(item.getSocialPaymentBaseString()) || StringUtils.isNotEmpty(item.getSocialPaymentComBaseString())) { Map socialJson = JSON.parseObject(item.getSocialPaymentBaseString(), new HashMap().getClass()); - if(socialJson!=null){ - socialJson.forEach((k, v) -> { - record.put(k + "socialBase", (String) v); +// if(socialJson!=null){ +// socialJson.forEach((k, v) -> { +// record.put(k + "socialBase", (String) v); +// }); +// } + if (welBaseDiffSign) { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "socialPerBase", v); + } + }); + } + Map socialComJson = JSON.parseObject(item.getSocialPaymentComBaseString(), new TypeReference>() { }); + if (socialComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + socialComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "socialComBase", v); + } + }); + } + } else { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "socialBase", v); + } + }); + } } } record.put("fundPayOrg", item.getFundPayOrg() == null ? "" : (paymentMap.getOrDefault(item.getFundPayOrg(),TaxAgentPO.builder().build())).getName()); record.put("fundAccount", item.getFundAccount()); record.put("fundSchemeName", getInsuranceSchemeMapper().querySchemeName(item.getFundSchemeId())); record.put("supplementFundAccount", item.getSupplementFundAccount()); - if (StringUtils.isNotEmpty(item.getFundPaymentBaseString())) { - Map socialJson = JSON.parseObject(item.getFundPaymentBaseString(), new HashMap().getClass()); - if(socialJson!=null){ - socialJson.forEach((k, v) -> { - record.put(k + "fundBase", (String) v); + if (StringUtils.isNotEmpty(item.getFundPaymentBaseString()) || StringUtils.isNotEmpty(item.getFundPaymentComBaseString())) { + Map fundJson = JSON.parseObject(item.getFundPaymentBaseString(), new HashMap().getClass()); +// if(fundJson!=null){ +// fundJson.forEach((k, v) -> { +// record.put(k + "fundBase", (String) v); +// }); +// } + if (welBaseDiffSign) { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "fundPerBase", v); + } + }); + } + Map fundComJson = JSON.parseObject(item.getFundPaymentComBaseString(), new TypeReference>() { }); + if (fundComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "fundComBase", v); + } + }); + } + } else { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "fundBase", v); + } + }); + } } } record.put("otherPayOrg", item.getOtherPayOrg() == null ? "" : (paymentMap.getOrDefault(item.getOtherPayOrg(),TaxAgentPO.builder().build())).getName()); record.put("otherSchemeName", getInsuranceSchemeMapper().querySchemeName(item.getOtherSchemeId())); - if (StringUtils.isNotEmpty(item.getOtherPaymentBaseString())) { - Map socialJson = JSON.parseObject(item.getOtherPaymentBaseString(), new HashMap().getClass()); - if(socialJson!=null){ - socialJson.forEach((k, v) -> { - record.put(k + "otherBase", (String) v); + if (StringUtils.isNotEmpty(item.getOtherPaymentBaseString()) || StringUtils.isNotEmpty(item.getOtherPaymentComBaseString())) { + Map otherJson = JSON.parseObject(item.getOtherPaymentBaseString(), new HashMap().getClass()); +// if(otherJson!=null){ +// otherJson.forEach((k, v) -> { +// record.put(k + "otherBase", (String) v); +// }); +// } + if (welBaseDiffSign) { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "otherPerBase", v); + } + }); + } + Map otherComJson = JSON.parseObject(item.getOtherPaymentComBaseString(), new TypeReference>() { }); + if (otherComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "otherComBase", v); + } + }); + } + } else { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "otherBase", v); + } + }); + } } } if (StringUtils.isNotEmpty(item.getSocialPerJson())) { diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java index 89f725a87..23587a874 100644 --- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java @@ -2,6 +2,7 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.bo.InsuranceComparisonResultBO; import com.engine.salary.entity.siaccount.dto.InsuranceComparisonResultListDTO; @@ -45,6 +46,8 @@ import java.util.stream.Collectors; public class SIAComparisonResultServiceImpl extends Service implements SIAComparisonResultService { private EncryptUtil encryptUtil = new EncryptUtil(); + private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + private InsuranceExportMapper getInsuranceExportMapper() { return MapperProxyFactory.getProxy(InsuranceExportMapper.class); } @@ -140,6 +143,7 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar */ private InsuranceComparisonResultListDTO listByParam(boolean needPage, InsuranceComparisonResultQueryParam queryParam) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); //排序配置 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); @@ -200,10 +204,10 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar Set insurancePerPaySet = new HashSet<>(insurancePerPayIds); Set insuranceComPaySet = new HashSet<>(insuranceComPayIds); //3-构建福利核算对比结果列表表头 - List weaTableColumns = InsuranceComparisonResultBO.buildTableColumns4ComparisonResult(insuranceBaseSet, insurancePerPaySet, insuranceComPaySet); + List weaTableColumns = InsuranceComparisonResultBO.buildTableColumns4ComparisonResult(insuranceBaseSet, insurancePerPaySet, insuranceComPaySet, welBaseDiffSign); //4-通过线上线下两份数据获得对比结果 Map schemeIdNameMap = getSISchemeService(user).getSchemeIdNameMap(); - List> resultMapList = InsuranceComparisonResultBO.buildComparisonTableData(accountExportPOS, excelAccountExportPOS, schemeIdNameMap); + List> resultMapList = InsuranceComparisonResultBO.buildComparisonTableData(accountExportPOS, excelAccountExportPOS, schemeIdNameMap, welBaseDiffSign); // 系统值和线下值一致的人员 if (queryParam.isOnlyDiffEmployee()) { diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 282a6f545..d9387e62c 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -65,6 +65,7 @@ import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtil; +import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.Column; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -2221,7 +2222,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { */ @Override public XSSFWorkbook exportComparisonWelfareTemplate(InsuranceAccountDetailParam param) { - + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); //查询线上福利核算记录 InsuranceExportParam insuranceExportParam = new InsuranceExportParam(); insuranceExportParam.setBillMonth(param.getBillMonth()); @@ -2279,20 +2280,57 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // "养老保险申报基数" // "医疗保险申报基数" // "工伤保险申报基数" - for (ICategoryPO po : socialWelfareList) { - headerList.add(po.getInsuranceName() + "申报基数"); +// for (ICategoryPO po : socialWelfareList) { +// headerList.add(po.getInsuranceName() + "申报基数"); +// } + //组装社保基数 + if (welBaseDiffSign) { + List socialComColumns = Lists.newArrayList(); + for (ICategoryPO po : socialWelfareList) { + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + socialComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + headerList.addAll(socialComColumns); + } else { + for (ICategoryPO po : socialWelfareList) { + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } } headerList.add(SalaryI18nUtil.getI18nLabel(91486, "公积金账号")); headerList.add(SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")); //组装公积金基数 - for (ICategoryPO po : fundWelfareList) { - headerList.add(po.getInsuranceName() + "申报基数"); +// for (ICategoryPO po : fundWelfareList) { +// headerList.add(po.getInsuranceName() + "申报基数"); +// } + if (welBaseDiffSign) { + List fundComColumns = Lists.newArrayList(); + for (ICategoryPO po : fundWelfareList) { + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + fundComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + headerList.addAll(fundComColumns); + } else { + for (ICategoryPO po : fundWelfareList) { + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } } headerList.add(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")); headerList.add(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")); //组装其他福利基数 - for (ICategoryPO po : otherWelfareList) { - headerList.add(po.getInsuranceName() + "申报基数"); +// for (ICategoryPO po : otherWelfareList) { +// headerList.add(po.getInsuranceName() + "申报基数"); +// } + if (welBaseDiffSign) { + List otherComColumns = Lists.newArrayList(); + for (ICategoryPO po : otherWelfareList) { + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + otherComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + headerList.addAll(otherComColumns); + } else { + for (ICategoryPO po : otherWelfareList) { + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } } //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） for (ICategoryPO po : socialWelPerList) { @@ -2335,7 +2373,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { rows.add(headerList); String sheetName = "福利核算-线下对比导入模板"; - return ExcelUtil.genWorkbookV2(rows, sheetName); + return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } /** diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index 1c351dfac..ac3ec8488 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -1,10 +1,12 @@ package com.engine.salary.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SIAccountBiz; +import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; import com.engine.salary.entity.siaccount.param.InsuranceAccountDetailParam; @@ -17,6 +19,7 @@ import com.engine.salary.enums.siaccount.BillStatusEnum; import com.engine.salary.enums.siaccount.PaymentStatusEnum; import com.engine.salary.enums.siaccount.ResourceFromEnum; import com.engine.salary.enums.sicategory.DataTypeEnum; +import com.engine.salary.enums.sicategory.PaymentScopeEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.mapper.InsuranceExportMapper; import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; @@ -37,6 +40,7 @@ import com.engine.salary.util.SalaryEnumUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtil; +import com.engine.salary.util.excel.ExcelUtilPlus; import org.springframework.beans.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -66,6 +70,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { private SIAccountBiz siAccountBiz = new SIAccountBiz(); + private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + private SISchemeService getSISchemeService(User user) { return ServiceUtil.getService(SISchemeServiceImpl.class, user); } @@ -242,11 +248,12 @@ public class SIExportServiceImpl extends Service implements SIExportService { } excelSheetData.addAll(rows); - return ExcelUtil.genWorkbookV2(excelSheetData, sheetName, total); + return ExcelUtilPlus.genWorkbookV2(excelSheetData, sheetName, total); } @Override public List> buildCommonRecords(List list) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); List> result = new ArrayList<>(); List paymentList = getTaxAgentMapper().listAll(); @@ -272,10 +279,42 @@ public class SIExportServiceImpl extends Service implements SIExportService { record.put("socialSchemeName", schemeIdNameMap.get(item.getSocialSchemeId())); if (StringUtils.isNotEmpty(item.getSocialPaymentBaseString())) { Map socialJson = JSON.parseObject(item.getSocialPaymentBaseString(), new HashMap().getClass()); - if (socialJson != null) { - socialJson.forEach((k, v) -> { - record.put(k + "socialBase", v); +// if (socialJson != null) { +// socialJson.forEach((k, v) -> { +// record.put(k + "socialBase", v); +// }); +// } + if (welBaseDiffSign) { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "socialPerBase", v); + } + }); + } + Map socialComJson = JSON.parseObject(item.getSocialPaymentComBaseString(), new TypeReference>() { }); + if (socialComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + socialComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "socialComBase", v); + } + }); + } + } else { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "socialBase", v); + } + }); + } } } @@ -284,22 +323,86 @@ public class SIExportServiceImpl extends Service implements SIExportService { record.put("fundSchemeName", schemeIdNameMap.get(item.getFundSchemeId())); record.put("supplementFundAccount", item.getSupplementFundAccount()); if (StringUtils.isNotEmpty(item.getFundPaymentBaseString())) { - Map socialJson = JSON.parseObject(item.getFundPaymentBaseString(), new HashMap().getClass()); - if (socialJson != null) { - socialJson.forEach((k, v) -> { - record.put(k + "fundBase", v); + Map fundJson = JSON.parseObject(item.getFundPaymentBaseString(), new HashMap().getClass()); +// if (fundJson != null) { +// fundJson.forEach((k, v) -> { +// record.put(k + "fundBase", v); +// }); +// } + if (welBaseDiffSign) { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "fundPerBase", v); + } + }); + } + Map fundComJson = JSON.parseObject(item.getFundPaymentComBaseString(), new TypeReference>() { }); + if (fundComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "fundComBase", v); + } + }); + } + } else { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "fundBase", v); + } + }); + } } } record.put("otherPayOrg", paymentMap.get(item.getOtherPayOrg()) == null ? "" : paymentMap.get(item.getOtherPayOrg()).getName()); record.put("otherSchemeName", schemeIdNameMap.get(item.getOtherSchemeId())); if (StringUtils.isNotEmpty(item.getOtherPaymentBaseString())) { - Map socialJson = JSON.parseObject(item.getOtherPaymentBaseString(), new HashMap().getClass()); - if (socialJson != null) { - socialJson.forEach((k, v) -> { - record.put(k + "otherBase", v); + Map otherJson = JSON.parseObject(item.getOtherPaymentBaseString(), new HashMap().getClass()); +// if (otherJson != null) { +// otherJson.forEach((k, v) -> { +// record.put(k + "otherBase", v); +// }); +// } + if (welBaseDiffSign) { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "otherPerBase", v); + } + }); + } + Map otherComJson = JSON.parseObject(item.getOtherPaymentComBaseString(), new TypeReference>() { }); + if (otherComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "otherComBase", v); + } + }); + } + } else { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + record.put(k + "otherBase", v); + } + }); + } } } @@ -628,58 +731,127 @@ public class SIExportServiceImpl extends Service implements SIExportService { } private Map> buildPaymentTitle(List pos, Map categoryIdNameMap) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); Set socailIds = new HashSet<>(); Set fundIds = new HashSet<>(); Set otherIds = new HashSet<>(); + + Set socailComIds = new HashSet<>(); + Set fundComIds = new HashSet<>(); + Set otherComIds = new HashSet<>(); + Map> result = new HashMap<>(); pos.stream().forEach(item -> { - if (StringUtils.isNotBlank(item.getSocialPaymentBaseString())) { + if (StringUtils.isNotBlank(item.getSocialPaymentBaseString()) || StringUtils.isNotBlank(item.getSocialPaymentComBaseString())) { Map socialJson = JSON.parseObject(item.getSocialPaymentBaseString(), new HashMap().getClass()); if (socialJson != null) { socialJson.forEach((k, v) -> { socailIds.add(k); }); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map socialComJson = JSON.parseObject(item.getSocialPaymentComBaseString(), new TypeReference>() { + }); + if (socialComJson != null) { + socialComJson.forEach((k, v) -> socailComIds.add(k)); + } + } } - if (StringUtils.isNotBlank(item.getFundPaymentBaseString())) { + if (StringUtils.isNotBlank(item.getFundPaymentBaseString()) || StringUtils.isNotBlank(item.getFundPaymentComBaseString())) { Map fundJson = JSON.parseObject(item.getFundPaymentBaseString(), new HashMap().getClass()); if (fundJson != null) { fundJson.forEach((k, v) -> { fundIds.add(k); }); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map fundComJson = JSON.parseObject(item.getFundPaymentComBaseString(), new TypeReference>() { + }); + if (fundComJson != null) { + fundComJson.forEach((k, v) -> fundComIds.add(k)); + } + } } - if (StringUtils.isNotBlank(item.getOtherPaymentBaseString())) { + if (StringUtils.isNotBlank(item.getOtherPaymentBaseString()) || StringUtils.isNotBlank(item.getOtherPaymentComBaseString())) { Map otherJson = JSON.parseObject(item.getOtherPaymentBaseString(), new HashMap().getClass()); if (otherJson != null) { otherJson.forEach((k, v) -> { otherIds.add(k); }); } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map otherComJson = JSON.parseObject(item.getOtherPaymentComBaseString(), new TypeReference>() { + }); + if (otherComJson != null) { + otherComJson.forEach((k, v) -> otherComIds.add(k)); + } + } } }); Map socialColumns = new HashMap<>(); Map fundColumns = new HashMap<>(); Map otherColumns = new HashMap<>(); - socailIds.stream().forEach(social -> { - if (categoryIdNameMap.containsKey(social)) { - socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(100293, "申报基数"), social + "socialBase"); - } - }); - fundIds.stream().forEach(social -> { - if (categoryIdNameMap.containsKey(social)) { - fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(100293, "申报基数"), social + "fundBase"); - } - }); - otherIds.stream().forEach(social -> { - if (categoryIdNameMap.containsKey(social)) { - otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(100293, "申报基数"), social + "otherBase"); - } - }); + + Map socialComColumns = new HashMap<>(); + Map fundComColumns = new HashMap<>(); + Map otherComColumns = new HashMap<>(); + + if (welBaseDiffSign) { + socailIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"), social + "socialPerBase"); + } + }); + fundIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"), social + "fundPerBase"); + } + }); + otherIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "个人"), social + "otherPerBase"); + } + }); + + socailComIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + socialComColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"), social + "socialComBase"); + } + }); + fundComIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + fundComColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"), social + "fundComBase"); + } + }); + otherComIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + otherComColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数") + SalaryI18nUtil.getI18nLabel( 0, "单位"), social + "otherComBase"); + } + }); + } else { + socailIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), social + "socialBase"); + } + }); + fundIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数"), social + "fundBase"); + } + }); + otherIds.stream().forEach(social -> { + if (categoryIdNameMap.containsKey(social)) { + otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 0, "申报基数"), social + "otherBase"); + } + }); + } // map根据value排序 LinkedHashMap socialColumnsWithAscValue = socialColumns.entrySet().stream() .sorted(Map.Entry.comparingByValue()) @@ -694,6 +866,24 @@ public class SIExportServiceImpl extends Service implements SIExportService { .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)); + if (welBaseDiffSign) { + LinkedHashMap socialComMapWithAscKey = socialComColumns.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap fundComMapWithAscKey = fundComColumns.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap otherComMapWithAscKey = otherComColumns.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + socialColumnsWithAscValue.putAll(socialComMapWithAscKey); + fundColumnsWithAscValue.putAll(fundComMapWithAscKey); + otherColumnsWithAscValue.putAll(otherComMapWithAscKey); + } + result.put(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), socialColumnsWithAscValue); result.put(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), fundColumnsWithAscValue); result.put(WelfareTypeEnum.OTHER.getValue(), otherColumnsWithAscValue); diff --git a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java index e1cf27275..e9a446dac 100644 --- a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java @@ -197,6 +197,9 @@ public class SIRecessionServiceImpl extends Service implements SIRecessionServic // temp.setExternalFlag(insuranceAccountDetailPO.getExternalFlag()); temp.setPaymentOrganization(insuranceAccountDetailPO.getPaymentOrganization()); // temp.setPaymentAgency(insuranceAccountDetailPO.getPaymentAgency()); + temp.setSocialPaymentComBaseString(insuranceAccountDetailPO.getSocialPaymentComBaseString()); + temp.setFundPaymentComBaseString(insuranceAccountDetailPO.getFundPaymentComBaseString()); + temp.setOtherPaymentComBaseString(insuranceAccountDetailPO.getOtherPaymentComBaseString()); } private void recessionSocial(RecessionParam param, InsuranceAccountDetailPO temp, InsuranceAccountDetailPO insuranceAccountDetailPO) { //退差社保个人缴费 diff --git a/src/com/engine/salary/web/SIAccountController.java b/src/com/engine/salary/web/SIAccountController.java index 75ad6975a..ab9a41c9c 100644 --- a/src/com/engine/salary/web/SIAccountController.java +++ b/src/com/engine/salary/web/SIAccountController.java @@ -2,6 +2,7 @@ package com.engine.salary.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; +import com.engine.salary.common.SalaryContext; import com.engine.salary.entity.hrm.dto.HrmInfoDTO; import com.engine.salary.entity.hrm.param.HrmQueryParam; import com.engine.salary.entity.siaccount.dto.InsuranceAccountTabDTO; @@ -37,11 +38,9 @@ import javax.ws.rs.core.StreamingOutput; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.time.LocalDate; -import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 福利核算控制器 @@ -50,6 +49,7 @@ import java.util.stream.Collectors; public class SIAccountController { public SIAccountService getService(User user) { + SalaryContext.get().setValue("user",user); return ServiceUtil.getService(SIAccountServiceImpl.class, user); } From 9d0d7a00fcf99f89b98f6dd8e29862107d60cb2c Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 8 Dec 2023 18:06:54 +0800 Subject: [PATCH 010/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=88=97=E8=A1=A8=E3=80=81=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA=EF=BC=8C=E9=80=82=E9=85=8D=E6=8B=86?= =?UTF-8?q?=E5=88=86=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E5=85=AC=E5=8F=B8=E5=9F=BA=E6=95=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bo/InsuranceComparisonResultBO.java | 6 - .../param/ExcelInsuranceImportParam.java | 3 +- .../siaccount/ExcelInsuranceDetailMapper.xml | 24 +- .../impl/SIAComparisonResultServiceImpl.java | 46 +- .../service/impl/SIAccountServiceImpl.java | 557 ++++++++++++++---- 5 files changed, 479 insertions(+), 157 deletions(-) diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java index 79909c1e2..c6e6b40a3 100644 --- a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java +++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java @@ -242,12 +242,6 @@ public class InsuranceComparisonResultBO { //其他福利基数，otherPaymentBaseString welfareElementCompare(map, accountExportPO.getOtherPaymentBaseString(), excelAccountExportPO.getOtherPaymentBaseString(), "Base", 3); } - //社保基数，socialPaymentBaseString - welfareElementCompare(map, accountExportPO.getSocialPaymentBaseString(), excelAccountExportPO.getSocialPaymentBaseString(), "Base", 1); - //公积金基数，fundPaymentBaseString - welfareElementCompare(map, accountExportPO.getFundPaymentBaseString(), excelAccountExportPO.getFundPaymentBaseString(), "Base", 2); - //其他福利基数，otherPaymentBaseString - welfareElementCompare(map, accountExportPO.getOtherPaymentBaseString(), excelAccountExportPO.getOtherPaymentBaseString(), "Base", 3); //社保个人socialPerJson welfareElementCompare(map, accountExportPO.getSocialPerJson(), excelAccountExportPO.getSocialPerJson(), "Per", 1); //公积金个人fundPerJson diff --git a/src/com/engine/salary/entity/siaccount/param/ExcelInsuranceImportParam.java b/src/com/engine/salary/entity/siaccount/param/ExcelInsuranceImportParam.java index 17b926b08..7a9090845 100644 --- a/src/com/engine/salary/entity/siaccount/param/ExcelInsuranceImportParam.java +++ b/src/com/engine/salary/entity/siaccount/param/ExcelInsuranceImportParam.java @@ -25,5 +25,6 @@ public class ExcelInsuranceImportParam { /** * 账单月份 */ - private String billMonth; + private String billMonth; + private String paymentOrganization; } diff --git a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml index d45fdec16..15ac635ce 100644 --- a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml @@ -157,7 +157,8 @@ (id,employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) VALUES ( @@ -204,7 +205,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey}, - #{item.paymentOrganization} + #{item.paymentOrganization}, + #{item.socialPaymentComBaseString}, + #{item.fundPaymentComBaseString}, + #{item.otherPaymentComBaseString} ) @@ -213,7 +217,8 @@ (id,employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) select #{item.id,jdbcType=DOUBLE}, @@ -259,7 +264,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey,jdbcType=VARCHAR}, - #{item.paymentOrganization,jdbcType=DOUBLE} + #{item.paymentOrganization,jdbcType=DOUBLE}, + #{item.socialPaymentComBaseString,jdbcType=VARCHAR}, + #{item.fundPaymentComBaseString,jdbcType=VARCHAR}, + #{item.otherPaymentComBaseString,jdbcType=VARCHAR} from dual @@ -269,7 +277,8 @@ (id,employee_id,bill_month,bill_status,payment_status,supplementary_month,supplementary_projects,resource_from,social_pay_org,social_account,social_scheme_id,social_payment_base_string, fund_pay_org,fund_account,supplement_fund_account,fund_scheme_id,fund_payment_base_string,other_pay_org,other_scheme_id,other_payment_base_string,social_per_json, social_per_sum,fund_per_json,fund_per_sum,other_per_json,other_per_sum,per_sum,social_com_json,social_com_sum,fund_com_json,fund_com_sum,other_com_json,other_com_sum, - com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization) + com_sum,social_sum,fund_sum,other_sum,total,creator,create_time,update_time,delete_type,tenant_key,payment_organization, + social_payment_com_base_string,fund_payment_com_base_string,other_payment_com_base_string) VALUES ( #{item.id}, @@ -315,7 +324,10 @@ #{item.updateTime}, #{item.deleteType}, #{item.tenantKey}, - #{item.paymentOrganization} + #{item.paymentOrganization}, + #{item.socialPaymentComBaseString}, + #{item.fundPaymentComBaseString}, + #{item.otherPaymentComBaseString} ) diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java index 23587a874..389e4ef2b 100644 --- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java @@ -25,6 +25,7 @@ import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtil; +import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.Column; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -134,7 +135,7 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar String sheetName = "线下对比结果"; - return ExcelUtil.genWorkbookV2(rows, sheetName); + return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } @@ -231,7 +232,7 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar } private Set welfareInfo() { - + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); Set info = new HashSet<>(); List listAll = getICategoryMapper().listAll(); @@ -239,18 +240,37 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar List fundWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 2).collect(Collectors.toList()); List otherWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 3).collect(Collectors.toList()); - //组装社保基数 - for (ICategoryPO po : socialWelfareList) { - info.add(po.getId() + "socialBase"); - } - //组装公积金基数 - for (ICategoryPO po : fundWelfareList) { - info.add(po.getId() + "fundBase"); - } - //组装其他福利基数 - for (ICategoryPO po : otherWelfareList) { - info.add(po.getId() + "otherBase"); + if (welBaseDiffSign) { + //组装社保基数 + for (ICategoryPO po : socialWelfareList) { + info.add(po.getId() + "socialPerBase"); + info.add(po.getId() + "socialComBase"); + } + //组装公积金基数 + for (ICategoryPO po : fundWelfareList) { + info.add(po.getId() + "fundPerBase"); + info.add(po.getId() + "fundComBase"); + } + //组装其他福利基数 + for (ICategoryPO po : otherWelfareList) { + info.add(po.getId() + "otherPerBase"); + info.add(po.getId() + "otherComBase"); + } + } else { + //组装社保基数 + for (ICategoryPO po : socialWelfareList) { + info.add(po.getId() + "socialBase"); + } + //组装公积金基数 + for (ICategoryPO po : fundWelfareList) { + info.add(po.getId() + "fundBase"); + } + //组装其他福利基数 + for (ICategoryPO po : otherWelfareList) { + info.add(po.getId() + "otherBase"); + } } + //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） for (ICategoryPO po : socialWelfareList) { info.add(po.getId() + "socialPer"); diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index d9387e62c..1385b84d7 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2222,6 +2222,78 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { */ @Override public XSSFWorkbook exportComparisonWelfareTemplate(InsuranceAccountDetailParam param) { + Map> welColumnMap = createWelColumnMap(param); + + List headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"), + SalaryI18nUtil.getI18nLabel(86185, "部门"), + SalaryI18nUtil.getI18nLabel(86186, "手机号"), + SalaryI18nUtil.getI18nLabel(86317, "工号"), + SalaryI18nUtil.getI18nLabel(86187, "员工状态"), + SalaryI18nUtil.getI18nLabel(100377, "数据来源"), + SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")); + headerList.add(SalaryI18nUtil.getI18nLabel(91324, "社保账号")); + headerList.add(SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")); + //组装社保基数 + if (welColumnMap.get("socialBase") != null) { + headerList.addAll(welColumnMap.get("socialBase")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(91486, "公积金账号")); + headerList.add(SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")); + //组装公积金基数 + if (welColumnMap.get("fundBase") != null) { + headerList.addAll(welColumnMap.get("fundBase")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")); + headerList.add(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")); + //组装其他福利基数 + if (welColumnMap.get("otherBase") != null) { + headerList.addAll(welColumnMap.get("otherBase")); + } + //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） + if (welColumnMap.get("socialPer") != null) { + headerList.addAll(welColumnMap.get("socialPer")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(100388, "社保个人合计")); + //住房公积金个人、补充住房公积金个人 + if (welColumnMap.get("fundPer") != null) { + headerList.addAll(welColumnMap.get("fundPer")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计")); + //其他个人（比如企业年金个人） + if (welColumnMap.get("otherPer") != null) { + headerList.addAll(welColumnMap.get("otherPer")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计")); + headerList.add(SalaryI18nUtil.getI18nLabel(100393, "个人合计")); + //社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位） + if (welColumnMap.get("socialCom") != null) { + headerList.addAll(welColumnMap.get("socialCom")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(100394, "社保单位合计")); + //住房公积金单位、补充住房公积金单位 + if (welColumnMap.get("fundCom") != null) { + headerList.addAll(welColumnMap.get("fundCom")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计")); + //其他单位（比如企业年金单位） + if (welColumnMap.get("otherCom") != null) { + headerList.addAll(welColumnMap.get("otherCom")); + } + headerList.add(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计")); + headerList.add(SalaryI18nUtil.getI18nLabel(100397, "单位合计")); + headerList.add(SalaryI18nUtil.getI18nLabel(100398, "社保合计")); + headerList.add(SalaryI18nUtil.getI18nLabel(100399, "公积金合计")); + headerList.add(SalaryI18nUtil.getI18nLabel(100400, "其他福利合计")); + headerList.add(SalaryI18nUtil.getI18nLabel(93278, "合计")); + + List> rows = new ArrayList<>(); + rows.add(headerList); + String sheetName = "福利核算-线下对比导入模板"; + + return ExcelUtilPlus.genWorkbookV2(rows, sheetName); + } + + public Map> createWelColumnMap(InsuranceAccountDetailParam param) { boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); //查询线上福利核算记录 InsuranceExportParam insuranceExportParam = new InsuranceExportParam(); @@ -2266,114 +2338,238 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List fundWelComList = listAll.stream().filter(e -> e.getWelfareType() == 2 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); List otherWelComList = listAll.stream().filter(e -> e.getWelfareType() == 3 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); - List headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(85429, "姓名"), - SalaryI18nUtil.getI18nLabel(86185, "部门"), - SalaryI18nUtil.getI18nLabel(86186, "手机号"), - SalaryI18nUtil.getI18nLabel(86317, "工号"), - SalaryI18nUtil.getI18nLabel(86187, "员工状态"), - SalaryI18nUtil.getI18nLabel(100377, "数据来源"), - SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")); - headerList.add(SalaryI18nUtil.getI18nLabel(91324, "社保账号")); - headerList.add(SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")); -// "失业保险申报基数" -// "生育保险申报基数" -// "养老保险申报基数" -// "医疗保险申报基数" -// "工伤保险申报基数" -// for (ICategoryPO po : socialWelfareList) { -// headerList.add(po.getInsuranceName() + "申报基数"); -// } //组装社保基数 + List socialBaseColumns = new ArrayList<>(); + List socialPerBaseColumns = new ArrayList<>(); + List socialComBaseColumns = Lists.newArrayList(); if (welBaseDiffSign) { - List socialComColumns = Lists.newArrayList(); for (ICategoryPO po : socialWelfareList) { - headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); - socialComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + socialPerBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + socialComBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); } - headerList.addAll(socialComColumns); + socialBaseColumns.addAll(socialPerBaseColumns); + socialBaseColumns.addAll(socialComBaseColumns); } else { for (ICategoryPO po : socialWelfareList) { - headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + socialBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); } } - headerList.add(SalaryI18nUtil.getI18nLabel(91486, "公积金账号")); - headerList.add(SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")); + //组装公积金基数 -// for (ICategoryPO po : fundWelfareList) { -// headerList.add(po.getInsuranceName() + "申报基数"); -// } + List fundBaseColumns = new ArrayList<>(); + List fundPerBaseColumns = Lists.newArrayList(); + List fundComBaseColumns = Lists.newArrayList(); if (welBaseDiffSign) { - List fundComColumns = Lists.newArrayList(); for (ICategoryPO po : fundWelfareList) { - headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); - fundComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + fundPerBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + fundComBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); } - headerList.addAll(fundComColumns); + fundBaseColumns.addAll(fundPerBaseColumns); + fundBaseColumns.addAll(fundComBaseColumns); } else { for (ICategoryPO po : fundWelfareList) { - headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + fundBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); } } - headerList.add(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")); - headerList.add(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")); + //组装其他福利基数 -// for (ICategoryPO po : otherWelfareList) { -// headerList.add(po.getInsuranceName() + "申报基数"); -// } + List otherBaseColumns = new ArrayList<>(); + List otherPerBaseColumns = new ArrayList<>(); + List otherComBaseColumns = Lists.newArrayList(); if (welBaseDiffSign) { - List otherComColumns = Lists.newArrayList(); for (ICategoryPO po : otherWelfareList) { - headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); - otherComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); + otherPerBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")); + otherComBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")); } - headerList.addAll(otherComColumns); + otherBaseColumns.addAll(otherPerBaseColumns); + otherBaseColumns.addAll(otherComBaseColumns); } else { for (ICategoryPO po : otherWelfareList) { - headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + otherBaseColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); } } + + //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） + List socialPerColumns = new ArrayList<>(); + for (ICategoryPO po : socialWelPerList) { + socialPerColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + //住房公积金个人、补充住房公积金个人 + List fundPerColumns = new ArrayList<>(); + for (ICategoryPO po : fundWelPerList) { + fundPerColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + //其他个人（比如企业年金个人） + List otherPerColumns = new ArrayList<>(); + for (ICategoryPO po : otherWelPerList) { + otherPerColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + //社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位） + List socialComColumns = new ArrayList<>(); + for (ICategoryPO po : socialWelComList) { + socialComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + //住房公积金单位、补充住房公积金单位 + List fundComColumns = new ArrayList<>(); + for (ICategoryPO po : fundWelComList) { + fundComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + + //其他单位（比如企业年金单位） + List otherComColumns = new ArrayList<>(); + for (ICategoryPO po : otherWelComList) { + otherComColumns.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + + Map> welColumnMap = new HashMap<>(); + welColumnMap.put("socialPerBase", socialPerBaseColumns); + welColumnMap.put("fundPerBase", fundPerBaseColumns); + welColumnMap.put("otherPerBase", otherPerBaseColumns); + welColumnMap.put("socialComBase", socialComBaseColumns); + welColumnMap.put("fundComBase", fundComBaseColumns); + welColumnMap.put("otherComBase", otherComBaseColumns); + welColumnMap.put("socialBase", socialBaseColumns); + welColumnMap.put("fundBase", fundBaseColumns); + welColumnMap.put("otherBase", otherBaseColumns); + welColumnMap.put("socialPer", socialPerColumns); + welColumnMap.put("fundPer", fundPerColumns); + welColumnMap.put("otherPer", otherPerColumns); + welColumnMap.put("socialCom", socialComColumns); + welColumnMap.put("fundCom", fundComColumns); + welColumnMap.put("otherCom", otherComColumns); + return welColumnMap; + } + + public Map welColumnNameCodeMap(InsuranceAccountDetailParam param) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + //查询线上福利核算记录 + InsuranceExportParam insuranceExportParam = new InsuranceExportParam(); + insuranceExportParam.setBillMonth(param.getBillMonth()); + insuranceExportParam.setPaymentOrganization(param.getPaymentOrganization()); + List accountExportPOS = getInsuranceExportMapper().exportAccount(param.getPaymentStatus(), insuranceExportParam); + + //整理线上核算记录相关的福利方案，并以此整理需要对比的福利项类别数据 + Set welfareSchemeIds = new HashSet<>(); + accountExportPOS.forEach(f -> { + welfareSchemeIds.add(f.getSocialSchemeId()); + welfareSchemeIds.add(f.getFundSchemeId()); + welfareSchemeIds.add(f.getOtherSchemeId()); + }); + List insuranceSchemeDetailPos = getInsuranceSchemeDetailMapper().listAll(); + List insuranceBaseIds = insuranceSchemeDetailPos.stream() + .filter(f -> welfareSchemeIds.contains(f.getPrimaryId()) && f.getIsPayment() == 1) + .map(InsuranceSchemeDetailPO::getInsuranceId) + .collect(Collectors.toList()); + List insurancePerPayIds = insuranceSchemeDetailPos.stream() + .filter(f -> welfareSchemeIds.contains(f.getPrimaryId()) && f.getIsPayment() == 1 && f.getPaymentScope() == 2) + .map(InsuranceSchemeDetailPO::getInsuranceId) + .collect(Collectors.toList()); + List insuranceComPayIds = insuranceSchemeDetailPos.stream() + .filter(f -> welfareSchemeIds.contains(f.getPrimaryId()) && f.getIsPayment() == 1 && f.getPaymentScope() == 1) + .map(InsuranceSchemeDetailPO::getInsuranceId) + .collect(Collectors.toList()); + Set insuranceBaseSet = new HashSet<>(insuranceBaseIds); + Set insurancePerPaySet = new HashSet<>(insurancePerPayIds); + Set insuranceComPaySet = new HashSet<>(insuranceComPayIds); + + List listAll = getICategoryMapper().listAll(); + List socialWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList()); + List fundWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 2 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList()); + List otherWelfareList = listAll.stream().filter(e -> e.getWelfareType() == 3 && e.getIsUse() == 1 && insuranceBaseSet.contains(e.getId())).collect(Collectors.toList()); + + List socialWelPerList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insurancePerPaySet.contains(e.getId())).collect(Collectors.toList()); + List fundWelPerList = listAll.stream().filter(e -> e.getWelfareType() == 2 && e.getIsUse() == 1 && insurancePerPaySet.contains(e.getId())).collect(Collectors.toList()); + List otherWelPerList = listAll.stream().filter(e -> e.getWelfareType() == 3 && e.getIsUse() == 1 && insurancePerPaySet.contains(e.getId())).collect(Collectors.toList()); + + List socialWelComList = listAll.stream().filter(e -> e.getWelfareType() == 1 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); + List fundWelComList = listAll.stream().filter(e -> e.getWelfareType() == 2 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); + List otherWelComList = listAll.stream().filter(e -> e.getWelfareType() == 3 && e.getIsUse() == 1 && insuranceComPaySet.contains(e.getId())).collect(Collectors.toList()); + + //组装社保基数 + Map result = new HashMap<>(); + if (welBaseDiffSign) { + for (ICategoryPO po : socialWelfareList) { + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"个人"), po.getId() + "socialPerBase"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"单位"), po.getId() + "socialComBase"); + } + } else { + for (ICategoryPO po : socialWelfareList) { + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "socialBase"); + } + } + + //组装公积金基数 + if (welBaseDiffSign) { + for (ICategoryPO po : fundWelfareList) { + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"个人"), po.getId() + "fundPerBase"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"单位"), po.getId() + "fundComBase"); + } + } else { + for (ICategoryPO po : fundWelfareList) { + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "fundBase"); + } + } + + //组装其他福利基数 + if (welBaseDiffSign) { + for (ICategoryPO po : otherWelfareList) { + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"个人"), po.getId() + "otherPerBase"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"单位"), po.getId() + "otherComBase"); + } + } else { + for (ICategoryPO po : otherWelfareList) { + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "otherBase"); + } + } + //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） for (ICategoryPO po : socialWelPerList) { - headerList.add(po.getInsuranceName() + "个人"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "socialPer"); } - headerList.add(SalaryI18nUtil.getI18nLabel(100388, "社保个人合计")); //住房公积金个人、补充住房公积金个人 for (ICategoryPO po : fundWelPerList) { - headerList.add(po.getInsuranceName() + "个人"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "fundPer"); } - headerList.add(SalaryI18nUtil.getI18nLabel(100390, "公积金个人合计")); //其他个人（比如企业年金个人） for (ICategoryPO po : otherWelPerList) { - headerList.add(po.getInsuranceName() + "个人"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "otherPer"); } - headerList.add(SalaryI18nUtil.getI18nLabel(100392, "其他福利个人合计")); - headerList.add(SalaryI18nUtil.getI18nLabel(100393, "个人合计")); //社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位） for (ICategoryPO po : socialWelComList) { - headerList.add(po.getInsuranceName() + "单位"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "socialCom"); } - headerList.add(SalaryI18nUtil.getI18nLabel(100394, "社保单位合计")); //住房公积金单位、补充住房公积金单位 for (ICategoryPO po : fundWelComList) { - headerList.add(po.getInsuranceName() + "单位"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "fundCom"); } - headerList.add(SalaryI18nUtil.getI18nLabel(100395, "公积金单位合计")); + //其他单位（比如企业年金单位） for (ICategoryPO po : otherWelComList) { - headerList.add(po.getInsuranceName() + "单位"); + result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) + + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "otherCom"); } - headerList.add(SalaryI18nUtil.getI18nLabel(100396, "其他福利单位合计")); - headerList.add(SalaryI18nUtil.getI18nLabel(100397, "单位合计")); - headerList.add(SalaryI18nUtil.getI18nLabel(100398, "社保合计")); - headerList.add(SalaryI18nUtil.getI18nLabel(100399, "公积金合计")); - headerList.add(SalaryI18nUtil.getI18nLabel(100400, "其他福利合计")); - headerList.add(SalaryI18nUtil.getI18nLabel(93278, "合计")); - List> rows = new ArrayList<>(); - rows.add(headerList); - String sheetName = "福利核算-线下对比导入模板"; - - return ExcelUtilPlus.genWorkbookV2(rows, sheetName); + return result; } /** @@ -2424,6 +2620,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } String billMonth = importParam.getBillMonth(); + + Map welColumnNameCodeMap = welColumnNameCodeMap(InsuranceAccountDetailParam.builder() + .billMonth(billMonth) + .paymentOrganization(importParam.getPaymentOrganization()) + .paymentStatus(PaymentStatusEnum.COMMON.getValue()) + .build()); //存储待更新的InsuranceAccountDetailPO数据 List addCompareList = new ArrayList<>(); //记录待删除hrsa_excel_bill_detail.id @@ -2518,7 +2720,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { idList.addAll(ids); } //拼装待更新数据 - addCompareList.add(handleExcelInsuranceDetail(billMonth, employeeId, paymentOrganization, map)); + addCompareList.add(handleExcelInsuranceDetail(billMonth, employeeId, paymentOrganization, map, welColumnNameCodeMap)); } @@ -2557,7 +2759,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { * @param billMonth 对比的账单月份 * @param baseMap excel导入的对比数据 */ - private ExcelInsuranceDetailPO handleExcelInsuranceDetail(String billMonth, Long employeeId, Long paymentOrganization, Map baseMap) { + private ExcelInsuranceDetailPO handleExcelInsuranceDetail(String billMonth, Long employeeId, Long paymentOrganization, Map baseMap, Map welColumnNameCodeMap) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); ExcelInsuranceDetailPO excelInsuranceDetailPO = new ExcelInsuranceDetailPO(); excelInsuranceDetailPO.setId(IdGenerator.generate()); @@ -2573,6 +2776,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { Map fundPaymentBaseMap = new HashMap<>(); Map otherPaymentBaseMap = new HashMap<>(); + Map socialPaymentComBaseMap = new HashMap<>(); + Map fundPaymentComBaseMap = new HashMap<>(); + Map otherPaymentComBaseMap = new HashMap<>(); + //筛选出福利核算项 Map toDealMap = baseMap.entrySet().stream() @@ -2586,73 +2793,157 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); for(Map.Entry entry : toDealMap.entrySet()) { - //判断元素是否属于福利类 - String keyName = entry.getKey(); - //获取元素名后缀，方便之后判断“个人”或“单位”或者“基数” - String payScope = keyName.substring(keyName.length() - 2); - //获取福利类型 - Integer welfareType; - //根据元素名后缀，区分截取内容 - String targetWelfareName; - if ("基数".equals(payScope)) { - targetWelfareName = entry.getKey().substring(0, keyName.length() - 4); - } else { - targetWelfareName = entry.getKey().substring(0, keyName.length() - 2); - } - List categoryPOList = siCategoryBiz.listByName(targetWelfareName); - if (categoryPOList.size() == 1) { - ICategoryPO iCategoryPO = categoryPOList.get(0); - welfareType = iCategoryPO.getWelfareType(); +// //判断元素是否属于福利类 +// String keyName = entry.getKey(); +// //获取元素名后缀，方便之后判断“个人”或“单位”或者“基数” +// String payScope = keyName.substring(keyName.length() - 2); +// //获取福利类型 +// Integer welfareType; +// //根据元素名后缀，区分截取内容 +// String targetWelfareName; +// if ("基数".equals(payScope)) { +// targetWelfareName = entry.getKey().substring(0, keyName.length() - 4); +// } else { +// targetWelfareName = entry.getKey().substring(0, keyName.length() - 2); +// } +// List categoryPOList = siCategoryBiz.listByName(targetWelfareName); +// if (categoryPOList.size() == 1) { +// ICategoryPO iCategoryPO = categoryPOList.get(0); +// welfareType = iCategoryPO.getWelfareType(); +// +// switch (payScope) { +// case "个人": +// switch (welfareType) { +// case 1: +// socialPerMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// case 2: +// fundPerMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// case 3: +// otherPerMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// default: +// throw new SalaryRunTimeException("福利类型不存在"); +// } +// break; +// case "单位": +// switch (welfareType) { +// case 1: +// socialComMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// case 2: +// fundComMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// case 3: +// otherComMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// default: +// throw new SalaryRunTimeException("福利类型不存在"); +// } +// break; +// case "基数": +// switch (welfareType) { +// case 1: +// socialPaymentBaseMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// case 2: +// fundPaymentBaseMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// case 3: +// otherPaymentBaseMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); +// break; +// default: +// throw new SalaryRunTimeException("福利类型不存在"); +// } +// break; +// } +// } - switch (payScope) { - case "个人": - switch (welfareType) { - case 1: - socialPerMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - case 2: - fundPerMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - case 3: - otherPerMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - default: - throw new SalaryRunTimeException("福利类型不存在"); - } - break; - case "单位": - switch (welfareType) { - case 1: - socialComMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - case 2: - fundComMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - case 3: - otherComMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - default: - throw new SalaryRunTimeException("福利类型不存在"); - } - break; - case "基数": - switch (welfareType) { - case 1: - socialPaymentBaseMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - case 2: - fundPaymentBaseMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - case 3: - otherPaymentBaseMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); - break; - default: - throw new SalaryRunTimeException("福利类型不存在"); - } - break; + if (welColumnNameCodeMap.get(entry.getKey()) != null) { + String code = welColumnNameCodeMap.get(entry.getKey()); + if (welBaseDiffSign) { + if (code.contains("socialPerBase")) { + code = code.replace("socialPerBase", ""); + socialPaymentBaseMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("socialComBase")) { + code = code.replace("socialComBase", ""); + socialPaymentComBaseMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("fundPerBase")) { + code = code.replace("fundPerBase", ""); + fundPaymentBaseMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("fundComBase")) { + code = code.replace("fundComBase", ""); + fundPaymentComBaseMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("otherPerBase")) { + code = code.replace("otherPerBase", ""); + otherPaymentBaseMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("otherComBase")) { + code = code.replace("otherComBase", ""); + otherPaymentComBaseMap.put(code, entry.getValue().toString()); + continue; + } + } else { + if (code.contains("socialBase")) { + code = code.replace("socialBase", ""); + socialPaymentBaseMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("fundBase")) { + code = code.replace("fundBase", ""); + fundPaymentBaseMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("otherBase")) { + code = code.replace("otherBase", ""); + otherPaymentBaseMap.put(code, entry.getValue().toString()); + continue; + } + } + + + if (code.contains("socialPer") && !code.contains("socialPerBase")) { + code = code.replace("socialPer", ""); + socialPerMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("fundPer") && !code.contains("fundPerBase")) { + code = code.replace("fundPer", ""); + fundPerMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("otherPer") && !code.contains("otherPerBase")) { + code = code.replace("otherPer", ""); + otherPerMap.put(code, entry.getValue().toString()); + continue; + } + + if (code.contains("socialCom") && !code.contains("socialComBase")) { + code = code.replace("socialCom", ""); + socialComMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("fundCom") && !code.contains("fundComBase")) { + code = code.replace("fundCom", ""); + fundComMap.put(code, entry.getValue().toString()); + continue; + } + if (code.contains("otherCom") && !code.contains("otherComBase")) { + code = code.replace("otherCom", ""); + otherComMap.put(code, entry.getValue().toString()); + continue; } } - } //设置社保个人和公司缴纳明细 @@ -2669,6 +2960,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { excelInsuranceDetailPO.setFundPaymentBaseString(JSON.toJSONString(fundPaymentBaseMap)); excelInsuranceDetailPO.setOtherPaymentBaseString(JSON.toJSONString(otherPaymentBaseMap)); + excelInsuranceDetailPO.setSocialPaymentComBaseString(JSON.toJSONString(socialPaymentComBaseMap)); + excelInsuranceDetailPO.setFundPaymentComBaseString(JSON.toJSONString(fundPaymentComBaseMap)); + excelInsuranceDetailPO.setOtherPaymentComBaseString(JSON.toJSONString(otherPaymentComBaseMap)); + //组装新的insuranceAccountDetailPO对象数据 excelInsuranceDetailPO.setEmployeeId(employeeId); excelInsuranceDetailPO.setBillMonth(billMonth); From d6705e89177195c20886b7aa6c416517c301682c Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 11 Dec 2023 13:09:20 +0800 Subject: [PATCH 011/169] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/bo/SalaryAcctResultReportBO.java | 40 -------- .../salaryacct/bo/SalaryAcctRecordBO.java | 3 - .../param/SalaryAcctResultBatchEditParam.java | 40 -------- .../SalaryAcctResultBatchUpdateParam.java | 2 +- .../service/SalaryAcctRecordService.java | 6 -- .../service/SalaryAcctReportService.java | 2 - .../service/SalaryAcctResultService.java | 6 -- .../impl/SalaryAcctRecordServiceImpl.java | 83 ---------------- .../impl/SalaryAcctReportServiceImpl.java | 13 --- .../impl/SalaryAcctResultServiceImpl.java | 97 ------------------- .../salary/web/SalaryAcctController.java | 17 ---- .../wrapper/SalaryAcctRecordWrapper.java | 8 -- .../wrapper/SalaryAcctResultWrapper.java | 9 -- 13 files changed, 1 insertion(+), 325 deletions(-) delete mode 100644 src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java diff --git a/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java b/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java index 485389860..06cb10a8a 100644 --- a/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java +++ b/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java @@ -8,7 +8,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTempPO; import dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.math.NumberUtils; import java.util.*; @@ -63,45 +62,6 @@ public class SalaryAcctResultReportBO { .collect(Collectors.toList()); } - public static List lkszConvert2PO(List items, - SalaryAcctEmployeePO salaryAcctEmployee, - Long employeeId, Map emps) { - if (CollectionUtils.isEmpty(items) || ObjectUtils.isEmpty(salaryAcctEmployee)) { - return Collections.emptyList(); - } - Date now = new Date(); - return items.stream() - .map(e -> { - SalaryAcctResultReportPO po = SalaryAcctResultReportPO.builder() - .id(IdGenerator.generate()) - .salarySobId(salaryAcctEmployee.getSalarySobId()) - .salaryItemId(e.getSalaryItemId()) - .salaryAcctRecordId(salaryAcctEmployee.getSalaryAcctRecordId()) - .salaryAcctEmpId(salaryAcctEmployee.getId().toString()) - .employeeId(salaryAcctEmployee.getEmployeeId().toString()) - .taxAgentId(salaryAcctEmployee.getTaxAgentId()) - .resultValue(e.getResultValue()) - .creator(employeeId) - .createTime(now) - .updateTime(now) - .deleteType(NumberUtils.INTEGER_ZERO) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .build(); - - DataCollectionEmployee dataCollectionEmployee = emps.get(salaryAcctEmployee.getEmployeeId()); - if (dataCollectionEmployee != null) { - po.setDepartmentId(dataCollectionEmployee.getDepartmentId()); - po.setSubcompanyId(dataCollectionEmployee.getSubcompanyid()); - po.setCostcenterId(dataCollectionEmployee.getCostcenterId()); - po.setJobtitleId(dataCollectionEmployee.getJobtitleId()); - po.setLocationId(dataCollectionEmployee.getLocationId()); - } - return po; - }) - .collect(Collectors.toList()); - } - - public static List convert2ReportPO(Collection temps, Map emps) { // Map longDataCollectionEmployeeMap = SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId); if (CollectionUtils.isEmpty(temps)) { diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index dbf3b552e..53eb473b6 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -70,16 +70,13 @@ public class SalaryAcctRecordBO { btnList.add(new WeaTableOperate("删除", null, "1")); } btnList.add(new WeaTableOperate("归档", null, "2")); - btnList.add(new WeaTableOperate("结转", null, "6")); } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && ( salarySendMap.get(salaryAcctRecordPO.getId()) ==Boolean.TRUE ) ){ btnList.add(new WeaTableOperate("查看", null, "3")); btnList.add(new WeaTableOperate("重新核算", null, "4")); btnList.add(new WeaTableOperate("回算", null, "5")); - btnList.add(new WeaTableOperate("结转", null, "6")); } else { btnList.add(new WeaTableOperate("查看", null, "3")); btnList.add(new WeaTableOperate("重新核算", null, "4")); - btnList.add(new WeaTableOperate("结转", null, "6")); } return SalaryAcctRecordListDTO.builder() .id(salaryAcctRecordPO.getId()) diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java deleted file mode 100644 index 487527d51..000000000 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchEditParam.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.engine.salary.entity.salaryacct.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @ClassName SalaryAcctResultBatchUpdateParam - * @author Harryxzy - * @date 2023/12/4 13:48 - * @description 鲁控数字批量编辑参数 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class SalaryAcctResultBatchEditParam { - - private Long salaryAcctRecordId; - - private List resultValueList; - - - @Data - @Builder - @AllArgsConstructor - @NoArgsConstructor - public static class resultValue { - - // 薪资核算人员id - private Long id; - - // 薪资项目值 - private List items; - } - -} diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java index 141b3a004..89c06ad5e 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultBatchUpdateParam.java @@ -12,7 +12,7 @@ import java.util.List; * @ClassName SalaryAcctResultBatchUpdateParam * @author Harryxzy * @date 2023/12/4 13:48 - * @description 鲁控数字批量更新参数 + * @description 批量更新参数 */ @Data @Builder diff --git a/src/com/engine/salary/service/SalaryAcctRecordService.java b/src/com/engine/salary/service/SalaryAcctRecordService.java index 9c3ba4f8c..1ba3419bf 100644 --- a/src/com/engine/salary/service/SalaryAcctRecordService.java +++ b/src/com/engine/salary/service/SalaryAcctRecordService.java @@ -207,10 +207,4 @@ public interface SalaryAcctRecordService { List listSome(SalaryAcctRecordPO po); - - /** - * 鲁控数字-结转 - * @param salaryAcctRecordId - */ - void lkszJz(Long salaryAcctRecordId); } diff --git a/src/com/engine/salary/service/SalaryAcctReportService.java b/src/com/engine/salary/service/SalaryAcctReportService.java index 6cf5caa12..c4c1636db 100644 --- a/src/com/engine/salary/service/SalaryAcctReportService.java +++ b/src/com/engine/salary/service/SalaryAcctReportService.java @@ -21,8 +21,6 @@ public interface SalaryAcctReportService { */ void batchSave(Collection pos); - void lkszBatchSave(Collection pos); - /** * 根据核算记录删除 * @param salaryAcctRecordIds diff --git a/src/com/engine/salary/service/SalaryAcctResultService.java b/src/com/engine/salary/service/SalaryAcctResultService.java index ec8efb878..0090f8330 100644 --- a/src/com/engine/salary/service/SalaryAcctResultService.java +++ b/src/com/engine/salary/service/SalaryAcctResultService.java @@ -210,10 +210,4 @@ public interface SalaryAcctResultService { * @param param */ void batchUpdate(SalaryAcctResultBatchUpdateParam param); - - /** - * 鲁控数字薪资核算结果批量编辑 - * @param param - */ - void lkszBatchEdit(SalaryAcctResultBatchEditParam param); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index ee596af21..d6924e489 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -825,87 +825,4 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe public List listSome(SalaryAcctRecordPO po) { return getSalaryAcctRecordMapper().listSome(po); } - - @Override - public void lkszJz(Long salaryAcctRecordId) { - SalaryAcctRecordPO salaryAcctRecordPO = getById(salaryAcctRecordId); - if (ObjectUtils.isEmpty(salaryAcctRecordPO)) { - throw new SalaryRunTimeException("薪资核算记录不存在或已被删除"); - } - YearMonth salaryMonth = SalaryDateUtil.toYearMonth(SalaryDateUtil.dateToLocalDate(salaryAcctRecordPO.getSalaryMonth()).plusMonths(1)); - // 创建下一个月的薪资核算记录 - Long newSalaryAcctRecordId = save(SalaryAcctRecordSaveParam.builder().salarySobId(salaryAcctRecordPO.getSalarySobId()).salaryMonth(salaryMonth).build()); - // 查询下个月的薪资核算人员 - List salaryAcctEmployeePOList = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(newSalaryAcctRecordId); - List acctEmpIds = salaryAcctEmployeePOList.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList()); - // 获取原来的薪资核算结果 - List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); - List salarySobItemIds = salarySobItemPOS.stream().map(SalarySobItemPO::getSalaryItemId).collect(Collectors.toList()); - List resultPOS = getSalaryAcctResultService(user).listBySalaryAcctRecordIdsAndSalaryItemIds(Collections.singletonList(salaryAcctRecordId), salarySobItemIds); - // 过滤掉新的核算记录中不存在的人 - resultPOS = resultPOS.stream().filter(result -> acctEmpIds.contains(result.getEmployeeId())).collect(Collectors.toList()); - Map> resultMap = SalaryEntityUtil.group2Map(resultPOS, SalaryAcctResultPO::getEmployeeId); - // 查询人员信息，供报表使用 - List dataCollectionEmployees = getSalaryEmployeeService(user).listAllForReport(); - Map emps = SalaryEntityUtil.convert2Map(dataCollectionEmployees, DataCollectionEmployee::getEmployeeId); - - // 需要保存的核算结果 - List needInsertResultList = new ArrayList<>(); - // 报表 - List needInsertResultReportList = new ArrayList<>(); - Date now = new Date(); - Long uid = Long.valueOf(user.getUID()); - salaryAcctEmployeePOList.stream().forEach(acctEmp -> { - List oldResultList = resultMap.get(acctEmp.getEmployeeId()); - oldResultList.stream().forEach(oldResult -> { - // 薪资核算结果 - needInsertResultList.add(SalaryAcctResultPO.builder() - .salarySobId(salaryAcctRecordPO.getSalarySobId()) - .salaryItemId(oldResult.getSalaryItemId()) - .salaryAcctRecordId(newSalaryAcctRecordId) - .salaryAcctEmpId(acctEmp.getId()) - .employeeId(acctEmp.getEmployeeId()) - .taxAgentId(acctEmp.getTaxAgentId()) - .resultValue(StringUtils.trim(oldResult.getResultValue())) - .originResultValue(oldResult.getOriginResultValue()) - .creator(uid) - .createTime(now) - .updateTime(now) - .deleteType(NumberUtils.INTEGER_ZERO) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .build()); - - // 报表结果 - SalaryAcctResultReportPO po = SalaryAcctResultReportPO.builder() - .id(IdGenerator.generate()) - .salarySobId(salaryAcctRecordPO.getSalarySobId()) - .salaryItemId(oldResult.getSalaryItemId()) - .salaryAcctRecordId(newSalaryAcctRecordId) - .salaryAcctEmpId(acctEmp.getId().toString()) - .employeeId(acctEmp.getEmployeeId().toString()) - .taxAgentId(acctEmp.getTaxAgentId()) - .resultValue(StringUtils.trim(oldResult.getResultValue())) - .creator(uid) - .createTime(now) - .updateTime(now) - .deleteType(NumberUtils.INTEGER_ZERO) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .build(); - - DataCollectionEmployee dataCollectionEmployee = emps.get(acctEmp.getEmployeeId()); - if (dataCollectionEmployee != null) { - po.setDepartmentId(dataCollectionEmployee.getDepartmentId()); - po.setSubcompanyId(dataCollectionEmployee.getSubcompanyid()); - po.setCostcenterId(dataCollectionEmployee.getCostcenterId()); - po.setJobtitleId(dataCollectionEmployee.getJobtitleId()); - po.setLocationId(dataCollectionEmployee.getLocationId()); - } - needInsertResultReportList.add(po); - }); - }); - - // 入库 - getSalaryAcctResultService(user).batchSave(needInsertResultList); - getSalaryAcctReportService(user).lkszBatchSave(needInsertResultReportList); - } } diff --git a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java index 43b7160a8..8371241fb 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java @@ -62,19 +62,6 @@ public class SalaryAcctReportServiceImpl extends Service implements SalaryAcctRe } } - @Override - public void lkszBatchSave(Collection pos) { - if (CollectionUtils.isNotEmpty(pos)) { - SalarySysConfPO disPlay = getSalarySysConfService(user).getOneByCode(DISPLAY_EMP_INFO_REPORT); - //默认不显示，关闭状态 - if (disPlay == null || OpenEnum.OFF.getValue().equals(disPlay.getConfValue())) { - pos = encryptUtil.encryptList(new ArrayList<>(pos), SalaryAcctResultReportPO.class); - } - List> partition = Lists.partition((List) pos, 100); - partition.forEach(getSalaryAcctResultReportMapper()::batchInsert); - } - } - @Override public void deleteBySalaryAcctRecordIds(Collection salaryAcctRecordIds) { if (CollectionUtils.isNotEmpty(salaryAcctRecordIds)) { diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 34148f289..5369fea9e 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1196,101 +1196,4 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } } - - @Override - public void lkszBatchEdit(SalaryAcctResultBatchEditParam param) { - List dataCollectionEmployees = getSalaryEmployeeService(user).listAllForReport(); - Map emps = SalaryEntityUtil.convert2Map(dataCollectionEmployees, DataCollectionEmployee::getEmployeeId); - - SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId()); - if (ObjectUtils.isEmpty(salaryAcctRecordPO)) { - throw new SalaryRunTimeException("薪资核算结果不存在或已被删除"); - } - - List salaryAcctEmployeePOList = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(param.getSalaryAcctRecordId()); - Map salaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(salaryAcctEmployeePOList, SalaryAcctEmployeePO::getId); - - // 需要更新数据的薪资核算人员id - List updateAcctEmpIds = param.getResultValueList().stream().map(SalaryAcctResultBatchEditParam.resultValue::getId).collect(Collectors.toList()); - // 查询原来的薪资核算结果 - List salaryAcctResultPOSOld = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpIds(updateAcctEmpIds).build()); - // 解密 - encryptUtil.decryptList(salaryAcctResultPOSOld, SalaryAcctResultPO.class); - // 保存参数转换成薪资核算结果po - List salaryAcctResultPOS = new ArrayList<>(); - // 获取薪资项目回算前的值 - Map salaryAcctResultOldPOMap = salaryAcctResultPOSOld.stream() - .collect(Collectors.groupingBy(p -> p.getSalaryAcctEmpId() + "-" + p.getSalaryItemId(), - Collectors.collectingAndThen(Collectors.maxBy(Comparator.comparing(SalaryAcctResultPO::getId)), - s -> s.map(SalaryAcctResultPO::getOriginResultValue).orElse("")))); - List salaryAcctResultReportPOS = new ArrayList<>(); - param.getResultValueList().forEach(resultValue -> { - SalaryAcctEmployeePO salaryAcctEmployeePO = salaryAcctEmployeePOMap.get(resultValue.getId()); - salaryAcctResultPOS.addAll(SalaryAcctResultBO.batchEditConvert2PO(salaryAcctResultOldPOMap, resultValue.getItems(), salaryAcctEmployeePO, (long) user.getUID())); - // 报表 - salaryAcctResultReportPOS.addAll(SalaryAcctResultReportBO.lkszConvert2PO(resultValue.getItems(), salaryAcctEmployeePO, (long) user.getUID(), emps)); - }); - - // 删除原来的薪资核算结果 - param.getResultValueList().stream().forEach(resultValue -> { - List saveItemIds = resultValue.getItems().stream().map(SalaryAcctResultSaveParam.SalaryAcctResultDetailItemParam::getSalaryItemId).collect(Collectors.toList()); - deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getId()), saveItemIds); - // 报表 - getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(resultValue.getId()), saveItemIds); - }); - - // 保存薪资核算结果 - if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { - // 加密 - encryptUtil.encryptList(salaryAcctResultPOS, SalaryAcctResultPO.class); - List> partition = Lists.partition(salaryAcctResultPOS, 100); - partition.forEach(getSalaryAcctResultMapper()::batchInsert); - } - - //报表 - if (CollectionUtils.isNotEmpty(salaryAcctResultReportPOS)) { - getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); - } - } - - - public void temp(SalaryAcctResultSaveParam saveParam){ - List dataCollectionEmployees = getSalaryEmployeeService(user).listAllForReport(); - Map emps = SalaryEntityUtil.convert2Map(dataCollectionEmployees, DataCollectionEmployee::getEmployeeId); - - // 查询薪资核算人员 - SalaryAcctEmployeePO salaryAcctEmployeePO = getSalaryAcctEmployeeService(user).getById(saveParam.getSalaryAcctEmpId()); - if (Objects.isNull(salaryAcctEmployeePO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "薪资核算人员不存在或已被删除")); - } - // 查询原来的薪资核算结果 - List salaryAcctResultPOSOld = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpId(saveParam.getSalaryAcctEmpId()).build()); - // 解密 - encryptUtil.decryptList(salaryAcctResultPOSOld, SalaryAcctResultPO.class); - // 保存参数转换成薪资核算结果po - List salaryAcctResultPOS = SalaryAcctResultBO.convert2PO(salaryAcctResultPOSOld, saveParam, salaryAcctEmployeePO, (long) user.getUID()); - SalarySysConfPO autoLock = getSalarySysConfService(user).getOneByCode(SalarySysConstant.EDIT_IMPORT_AUTO_LOCK); - - // 删除原来的薪资核算结果 - List saveItemIds = saveParam.getItems().stream().map(SalaryAcctResultSaveParam.SalaryAcctResultDetailItemParam::getSalaryItemId).collect(Collectors.toList()); - deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(saveParam.getSalaryAcctEmpId()), saveItemIds); - // 保存薪资核算结果 - if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { - // 加密 - encryptUtil.encryptList(salaryAcctResultPOS, SalaryAcctResultPO.class); - List> partition = Lists.partition(salaryAcctResultPOS, 100); - partition.forEach(getSalaryAcctResultMapper()::batchInsert); - } - //报表 todo - getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(Collections.singletonList(saveParam.getSalaryAcctEmpId()), saveItemIds); - List salaryAcctResultReportPOS = SalaryAcctResultReportBO.convert2PO(saveParam, salaryAcctEmployeePO, (long) user.getUID(), emps); - if (CollectionUtils.isNotEmpty(salaryAcctResultReportPOS)) { - getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); - } - - - // 存储薪资核算结果数据来源日志 - salaryAcctResultPOS = getSalaryAcctRecordService(user).listBySalaryAcctEmpId(saveParam.getSalaryAcctEmpId()); - saveSalaryAcctResultLog(salaryAcctResultPOSOld, salaryAcctResultPOS); - } } \ No newline at end of file diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index c6032686c..4a8088761 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -159,14 +159,6 @@ public class SalaryAcctController { return new ResponseResult(user).run(getSalaryAcctRecordWrapper(user)::backCalculate, param.getSalaryAcctRecordId()); } - // 结转 - @GET - @Path("/lkszJz") - @Produces(MediaType.APPLICATION_JSON) - public String lkszJz(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "id") Long id) { - User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getSalaryAcctRecordWrapper(user)::lkszJz, id); - } /* ********************************薪资核算记录相关 end*********************************/ @@ -466,15 +458,6 @@ public class SalaryAcctController { return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::batchUpdate, param); } - //鲁控数字批量编辑 - @POST - @Path("/acctresult/lkszBatchEdit") - @Produces(MediaType.APPLICATION_JSON) - public String lkszBatchEdit(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryAcctResultBatchEditParam param) { - User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getSalaryAcctResultWrapper(user)::lkszBatchEdit, param); - } - //薪资核算 @POST @Path("/acctresult/accounting") diff --git a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java index 95b461e7d..b3d7d06e3 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java @@ -266,12 +266,4 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord public void backCalculate(Long salaryAcctRecordId){ getSalaryAcctRecordService(user).backCalculate(salaryAcctRecordId); } - - /** - * 鲁控数字-结转 - * @param salaryAcctRecordId - */ - public void lkszJz(Long salaryAcctRecordId) { - getSalaryAcctRecordService(user).lkszJz(salaryAcctRecordId); - } } diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index 2bf31ef9c..5c1347343 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -265,15 +265,6 @@ public class SalaryAcctResultWrapper extends Service { getSalaryAcctResultService(user).batchUpdate(param); } - /** - * 鲁控数字薪资核算结果批量编辑 - * @param param - */ - public void lkszBatchEdit(SalaryAcctResultBatchEditParam param) { - getSalaryAcctResultService(user).lkszBatchEdit(param); - } - - /** * 薪资核算-校验 * From e97dab27fc162809bac36042006d229ca231b5ff Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 13 Dec 2023 10:51:24 +0800 Subject: [PATCH 012/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=8B=86=E5=88=86?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E5=9F=BA=E6=95=B0=E9=80=BB=E8=BE=91=E7=9B=B8=E5=85=B3sql?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202312130203.sql | 39 +++++++++++++++++++ resource/sqlupgrade/GS/sql202312130203.sql | 39 +++++++++++++++++++ resource/sqlupgrade/JC/sql202312130203.sql | 39 +++++++++++++++++++ resource/sqlupgrade/Mysql/sql202312130203.sql | 17 ++++++++ .../sqlupgrade/Oracle/sql202312130203.sql | 30 ++++++++++++++ resource/sqlupgrade/PG/sql202312130203.sql | 17 ++++++++ .../sqlupgrade/SQLServer/sql202312130203.sql | 30 ++++++++++++++ resource/sqlupgrade/ST/sql202312130203.sql | 39 +++++++++++++++++++ 8 files changed, 250 insertions(+) create mode 100644 resource/sqlupgrade/DM/sql202312130203.sql create mode 100644 resource/sqlupgrade/GS/sql202312130203.sql create mode 100644 resource/sqlupgrade/JC/sql202312130203.sql create mode 100644 resource/sqlupgrade/Mysql/sql202312130203.sql create mode 100644 resource/sqlupgrade/Oracle/sql202312130203.sql create mode 100644 resource/sqlupgrade/PG/sql202312130203.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202312130203.sql create mode 100644 resource/sqlupgrade/ST/sql202312130203.sql diff --git a/resource/sqlupgrade/DM/sql202312130203.sql b/resource/sqlupgrade/DM/sql202312130203.sql new file mode 100644 index 000000000..d5bdd577d --- /dev/null +++ b/resource/sqlupgrade/DM/sql202312130203.sql @@ -0,0 +1,39 @@ +ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL; +/ + diff --git a/resource/sqlupgrade/GS/sql202312130203.sql b/resource/sqlupgrade/GS/sql202312130203.sql new file mode 100644 index 000000000..d5bdd577d --- /dev/null +++ b/resource/sqlupgrade/GS/sql202312130203.sql @@ -0,0 +1,39 @@ +ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL; +/ + diff --git a/resource/sqlupgrade/JC/sql202312130203.sql b/resource/sqlupgrade/JC/sql202312130203.sql new file mode 100644 index 000000000..d5bdd577d --- /dev/null +++ b/resource/sqlupgrade/JC/sql202312130203.sql @@ -0,0 +1,39 @@ +ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202312130203.sql b/resource/sqlupgrade/Mysql/sql202312130203.sql new file mode 100644 index 000000000..7ff70da9f --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202312130203.sql @@ -0,0 +1,17 @@ +ALTER TABLE hrsa_social_archives ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_fund_archives ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_other_archives ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_insurance_base_history ADD COLUMN payment_scope varchar(10) NULL; diff --git a/resource/sqlupgrade/Oracle/sql202312130203.sql b/resource/sqlupgrade/Oracle/sql202312130203.sql new file mode 100644 index 000000000..f62d861b8 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202312130203.sql @@ -0,0 +1,30 @@ +ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL +/ + +ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL +/ + +ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL +/ + +ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL +/ +ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL +/ + +ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202312130203.sql b/resource/sqlupgrade/PG/sql202312130203.sql new file mode 100644 index 000000000..9b9630ce6 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202312130203.sql @@ -0,0 +1,17 @@ +ALTER TABLE hrsa_social_archives ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_fund_archives ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_other_archives ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL; + +ALTER TABLE hrsa_insurance_base_history ADD COLUMN payment_scope varchar(10) NULL; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202312130203.sql b/resource/sqlupgrade/SQLServer/sql202312130203.sql new file mode 100644 index 000000000..0738202b3 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202312130203.sql @@ -0,0 +1,30 @@ +ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar(4000) NULL +GO + +ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar(4000) NULL +GO + +ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar(4000) NULL +GO + +ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar(4000) NULL +GO +ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar(4000) NULL +GO + +ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar(10) NULL +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202312130203.sql b/resource/sqlupgrade/ST/sql202312130203.sql new file mode 100644 index 000000000..d5bdd577d --- /dev/null +++ b/resource/sqlupgrade/ST/sql202312130203.sql @@ -0,0 +1,39 @@ +ALTER TABLE hrsa_social_archives ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_fund_archives ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_other_archives ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_bill_detail_temp ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD social_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD fund_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_excel_bill_detail ADD other_payment_com_base_string varchar2(4000) NULL; +/ + +ALTER TABLE hrsa_insurance_base_history ADD payment_scope varchar2(10) NULL; +/ + From 96d37b1b68acee1f29a88860cb4085622d391177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 14 Dec 2023 10:39:49 +0800 Subject: [PATCH 013/169] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B3=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SalaryStatisticsReportServiceImpl.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index c71f5193c..4bb650f92 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -352,7 +352,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary po.setCreator(uid); po.setCreateTime(now); po.setUpdateTime(now); - po.setReportName(po.getReportName()+"_copy"); + po.setReportName(po.getReportName() + "_copy"); getSalaryStatisticsReportMapper().insertIgnoreNull(po); @@ -414,11 +414,21 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary param.setSalaryStartMonth(SalaryDateUtil.getFormatYearMonth(reportPO.getSalaryStartMonth())); param.setSalaryEndMonth(SalaryDateUtil.getFormatYearMonth(reportPO.getSalaryEndMonth())); String key = "id"; - param.setTaxAgent(((List) JSON.parseArray(reportPO.getTaxAgentSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); - param.setSubCompany(((List) JSON.parseArray(reportPO.getSubCompanySetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); - param.setDepart(((List) JSON.parseArray(reportPO.getDepartSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); - param.setEmployee(((List) JSON.parseArray(reportPO.getEmployeeSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); - param.setHiredate(JSON.parseArray(reportPO.getHiredateSetting(), Date.class)); + if (reportPO.getTaxAgentSetting() != null) { + param.setTaxAgent(((List) JSON.parseArray(reportPO.getTaxAgentSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); + } + if (reportPO.getSubCompanySetting() != null) { + param.setSubCompany(((List) JSON.parseArray(reportPO.getSubCompanySetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); + } + if (reportPO.getDepartSetting() != null) { + param.setDepart(((List) JSON.parseArray(reportPO.getDepartSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); + } + if (reportPO.getEmployeeSetting() != null) { + param.setEmployee(((List) JSON.parseArray(reportPO.getEmployeeSetting(), Map.class)).stream().map(m -> Long.valueOf(m.get(key).toString())).collect(Collectors.toList())); + } + if (reportPO.getHiredateSetting() != null) { + param.setHiredate(JSON.parseArray(reportPO.getHiredateSetting(), Date.class)); + } SalaryStatisticsReportDataQueryParam queryParam = new SalaryStatisticsReportDataQueryParam(); com.mzlion.core.utils.BeanUtils.copyProperties(param, queryParam); // 获取本期报表分权后的核算人员 @@ -1062,7 +1072,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary List fieldSettings = Optional.ofNullable(Optional.ofNullable(employeeInfoExpandDTO).orElse(new EmployeeInfoExpandDTO()).getFieldSettings()).orElse(new ArrayList<>()); Map> expandEmployeeMap = getSalaryEmployeeService(user).expandEmployeeMap(empIds, employeeInfoExpandDTO); - log.info("扩展属性"+expandEmployeeMap); + log.info("扩展属性" + expandEmployeeMap); // List extEmployees = extEmployeeService.listByIdsWithDeleted(accountDetailPOList.stream().filter(e -> EmployeeTypeEnum.EXT_EMPLOYEE.getValue().equals(e.getEmployeeType())).map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList()), data.getTenantKey()); // Map employeeExtByIdMap = SalaryEntityUtil.convert2Map(extEmployees, ExtEmployeePO::getId, ExtEmployeePO::getUsername); @@ -1075,7 +1085,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary temp.put(DM, employeeByIdMap.get(k).getUsername()); fieldSettings.forEach( fieldSetting -> { - temp.put(fieldSetting.getField(), expandEmployeeMap.getOrDefault(k,new HashMap<>()).get(fieldSetting.getField())); + temp.put(fieldSetting.getField(), expandEmployeeMap.getOrDefault(k, new HashMap<>()).get(fieldSetting.getField())); } ); temp.putAll(SalaryStatisticsReportBO.calculateItem(v, lastEmployeeListMap.get(k), sameEmployeeListMap.get(k), salaryAcctResultValueMap, data.getSalaryStatisticsItemList())); From 2685c724e4408337958de4dc7b64a58aaf492798 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 14 Dec 2023 13:59:39 +0800 Subject: [PATCH 014/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=BC=96=E8=BE=91=E9=A1=B5=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 32186cbbb..f2f3feee7 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -317,6 +317,12 @@ public class SIArchivesBiz { List inputItems = buildPaymentBase(user, schemeId, welfareType); addGroups.add(new SearchConditionGroup("其它福利缴纳基数", true, inputItems)); dataMap.put("items", addGroups); + if (welBaseDiffSign) { + List addComGroups = new ArrayList<>(); + List inputComItems = buildPaymentComBase(user, schemeId, welfareType); + addComGroups.add(new SearchConditionGroup("其它福利缴纳基数", true, inputComItems)); + dataMap.put("comItems", addComGroups); + } return dataMap; } @@ -344,6 +350,12 @@ public class SIArchivesBiz { List inputItems = buildPaymentBase(user, schemeId, welfareType); addGroups.add(new SearchConditionGroup("公积金缴纳基数", true, inputItems)); dataMap.put("items", addGroups); + if (welBaseDiffSign) { + List addComGroups = new ArrayList<>(); + List inputComItems = buildPaymentComBase(user, schemeId, welfareType); + addComGroups.add(new SearchConditionGroup("公积金缴纳基数", true, inputComItems)); + dataMap.put("comItems", addComGroups); + } return dataMap; } From 7cb0e686238e8e48ce887a84e32d7c5fe9298939 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 15 Dec 2023 09:50:20 +0800 Subject: [PATCH 015/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=BC=96=E8=BE=91=E9=A1=B5=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E5=9F=BA=E6=95=B0=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/siarchives/bo/InsuranceArchivesBO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java index a96b96aad..710038513 100644 --- a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java +++ b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java @@ -35,6 +35,7 @@ public class InsuranceArchivesBO { .socialStartTime(po.getSocialStartTime()) .schemeAccount(po.getSocialAccount()) .schemePaymentBaseString(po.getSocialPaymentBaseString()) + .schemePaymentComBaseString(po.getSocialPaymentComBaseString()) .underTake(po.getUnderTake() == null ? null : String.valueOf(po.getUnderTake())) .build(); } @@ -52,6 +53,7 @@ public class InsuranceArchivesBO { .fundSchemeId(po.getFundSchemeId()) .paymentOrganization(po.getPaymentOrganization()) .fundPaymentBaseString(po.getFundPaymentBaseString()) + .fundPaymentComBaseString(po.getFundPaymentComBaseString()) .fundStartTime(po.getFundStartTime()) .supplementFundAccount(po.getSupplementFundAccount()) .nonPayment(po.getNonPayment()) @@ -72,6 +74,7 @@ public class InsuranceArchivesBO { .otherName(po.getOtherSchemeId() == null ? null : String.valueOf(po.getOtherSchemeId())) .otherSchemeId(po.getOtherSchemeId()) .otherPaymentBaseString(po.getOtherPaymentBaseString()) + .otherPaymentComBaseString(po.getOtherPaymentComBaseString()) .otherStartTime(po.getOtherStartTime()) .otherEndTime(po.getOtherEndTime()) .paymentOrganization(po.getPaymentOrganization()) From 4f8606b00ee4311c09848fa62f183b56f6fa9940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sat, 16 Dec 2023 12:35:24 +0800 Subject: [PATCH 016/169] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/report/wrapper/SalaryStatisticsReportWrapper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java index ce270b1fa..86b7aeb7d 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java @@ -216,6 +216,7 @@ public class SalaryStatisticsReportWrapper extends Service { /** * 复制薪资账套 + * * @param id */ public void duplicate(Long id) { @@ -322,7 +323,7 @@ public class SalaryStatisticsReportWrapper extends Service { //报表中缓存的条件 salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id)); if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) { - return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5); + return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); } } @@ -346,7 +347,7 @@ public class SalaryStatisticsReportWrapper extends Service { getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_IDS, salaryReportIds + "," + id); getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id, salaryReportConditions + "," + paramMd5); - getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5, resultMap); + getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5, resultMap); return resultMap; From bda3d7080bee22cb7fab3b869b54840066c4e6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sat, 16 Dec 2023 12:36:56 +0800 Subject: [PATCH 017/169] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/SalaryStatisticsReportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 4bb650f92..3f9745f11 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -497,7 +497,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary Arrays.asList(salaryReportConditions.split(",")).forEach(paramMd5 -> { if (StringUtils.isNotBlank(paramMd5)) { //条件对应的结果 - getSalaryCacheService(user).remove(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5); + getSalaryCacheService(user).remove(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); } } ); From e8223a832bb0c89038a2f3b56811fd88a365abdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sat, 16 Dec 2023 12:40:33 +0800 Subject: [PATCH 018/169] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/report/wrapper/SalaryStatisticsReportWrapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java index 86b7aeb7d..508877028 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java @@ -345,6 +345,7 @@ public class SalaryStatisticsReportWrapper extends Service { resultMap.put("reportId", id); + //设置报表缓存 getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_IDS, salaryReportIds + "," + id); getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id, salaryReportConditions + "," + paramMd5); getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5, resultMap); From b20a3ef10363e20c111ad2fa81f1871345d9ff71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 20 Dec 2023 21:00:48 +0800 Subject: [PATCH 019/169] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/elog/annotation/Elog.java | 23 + .../elog/annotation/ElogDetailField.java | 14 + .../elog/annotation/ElogDetailTable.java | 13 + .../salary/elog/annotation/ElogField.java | 23 + .../elog/annotation/ElogPrimaryKey.java | 9 + .../salary/elog/annotation/ElogTable.java | 16 + .../salary/elog/annotation/LoggerTarget.java | 24 ++ .../elog/annotation/handle/ElogHandler.java | 177 ++++++++ .../annotation/handle/ElogTableScanner.java | 172 ++++++++ .../handle/LoggerTargetHandler.java | 40 ++ .../engine/salary/elog/dto/CancelContext.java | 25 ++ .../engine/salary/elog/dto/DateTypeEnum.java | 16 + .../engine/salary/elog/dto/LoggerContext.java | 408 ++++++++++++++++++ .../salary/elog/dto/LoggerDetailContext.java | 102 +++++ .../engine/salary/elog/dto/RedoContext.java | 24 ++ .../salary/elog/dto/TableChangeBean.java | 53 +++ .../salary/elog/dto/TableColumnBean.java | 155 +++++++ .../engine/salary/elog/util/ElogUtils.java | 50 +++ .../salary/elog/util/LoggerTemplate.java | 164 +++++++ .../elog/util/LoggerTemplateBuilder.java | 21 + 20 files changed, 1529 insertions(+) create mode 100644 src/com/engine/salary/elog/annotation/Elog.java create mode 100644 src/com/engine/salary/elog/annotation/ElogDetailField.java create mode 100644 src/com/engine/salary/elog/annotation/ElogDetailTable.java create mode 100644 src/com/engine/salary/elog/annotation/ElogField.java create mode 100644 src/com/engine/salary/elog/annotation/ElogPrimaryKey.java create mode 100644 src/com/engine/salary/elog/annotation/ElogTable.java create mode 100644 src/com/engine/salary/elog/annotation/LoggerTarget.java create mode 100644 src/com/engine/salary/elog/annotation/handle/ElogHandler.java create mode 100644 src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java create mode 100644 src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java create mode 100644 src/com/engine/salary/elog/dto/CancelContext.java create mode 100644 src/com/engine/salary/elog/dto/DateTypeEnum.java create mode 100644 src/com/engine/salary/elog/dto/LoggerContext.java create mode 100644 src/com/engine/salary/elog/dto/LoggerDetailContext.java create mode 100644 src/com/engine/salary/elog/dto/RedoContext.java create mode 100644 src/com/engine/salary/elog/dto/TableChangeBean.java create mode 100644 src/com/engine/salary/elog/dto/TableColumnBean.java create mode 100644 src/com/engine/salary/elog/util/ElogUtils.java create mode 100644 src/com/engine/salary/elog/util/LoggerTemplate.java create mode 100644 src/com/engine/salary/elog/util/LoggerTemplateBuilder.java diff --git a/src/com/engine/salary/elog/annotation/Elog.java b/src/com/engine/salary/elog/annotation/Elog.java new file mode 100644 index 000000000..7e00ca25e --- /dev/null +++ b/src/com/engine/salary/elog/annotation/Elog.java @@ -0,0 +1,23 @@ +package com.engine.salary.elog.annotation; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD}) +public @interface Elog { + + String module(); + + String function(); + + String operateType(); + + String operateTypeName(); + + String sql() default ""; + + boolean isLocal() default true; + + String infoMethod() default ""; +} diff --git a/src/com/engine/salary/elog/annotation/ElogDetailField.java b/src/com/engine/salary/elog/annotation/ElogDetailField.java new file mode 100644 index 000000000..129c57da8 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/ElogDetailField.java @@ -0,0 +1,14 @@ +package com.engine.salary.elog.annotation; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +public @interface ElogDetailField { + + String fieldType() default "varchar"; + String length() default "50"; + String fieldName(); + String desc() default "自定义字段"; +} diff --git a/src/com/engine/salary/elog/annotation/ElogDetailTable.java b/src/com/engine/salary/elog/annotation/ElogDetailTable.java new file mode 100644 index 000000000..d5054b7c1 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/ElogDetailTable.java @@ -0,0 +1,13 @@ +package com.engine.salary.elog.annotation; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface ElogDetailTable { + + String module(); + + String function() default "common"; +} diff --git a/src/com/engine/salary/elog/annotation/ElogField.java b/src/com/engine/salary/elog/annotation/ElogField.java new file mode 100644 index 000000000..3b5df99c2 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/ElogField.java @@ -0,0 +1,23 @@ +package com.engine.salary.elog.annotation; + +import com.engine.salary.elog.dto.DateTypeEnum; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +public @interface ElogField { + + DateTypeEnum dataType() default DateTypeEnum.VARCHAR; + + int length() default 50; + + String comment() default "自定义字段"; + + String defaultValue() default ""; + + boolean isNull() default true; + + boolean isKey() default false; +} diff --git a/src/com/engine/salary/elog/annotation/ElogPrimaryKey.java b/src/com/engine/salary/elog/annotation/ElogPrimaryKey.java new file mode 100644 index 000000000..291f82562 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/ElogPrimaryKey.java @@ -0,0 +1,9 @@ +package com.engine.salary.elog.annotation; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.PARAMETER}) +public @interface ElogPrimaryKey { +} diff --git a/src/com/engine/salary/elog/annotation/ElogTable.java b/src/com/engine/salary/elog/annotation/ElogTable.java new file mode 100644 index 000000000..28f5f853b --- /dev/null +++ b/src/com/engine/salary/elog/annotation/ElogTable.java @@ -0,0 +1,16 @@ +package com.engine.salary.elog.annotation; + +import org.springframework.stereotype.Component; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Component +public @interface ElogTable { + + String module(); + + String function() default "common"; +} diff --git a/src/com/engine/salary/elog/annotation/LoggerTarget.java b/src/com/engine/salary/elog/annotation/LoggerTarget.java new file mode 100644 index 000000000..c1e337ca3 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/LoggerTarget.java @@ -0,0 +1,24 @@ +package com.engine.salary.elog.annotation; + +import org.springframework.core.annotation.AliasFor; + +import java.lang.annotation.*; + +/** + * @ClassName: LoggerTarget + * @Description 日志构造器-自定义注解 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface LoggerTarget { + @AliasFor("module") + String value() default ""; + + @AliasFor("value") + String module() default ""; + + String function() default "common"; +} diff --git a/src/com/engine/salary/elog/annotation/handle/ElogHandler.java b/src/com/engine/salary/elog/annotation/handle/ElogHandler.java new file mode 100644 index 000000000..815191606 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/handle/ElogHandler.java @@ -0,0 +1,177 @@ +package com.engine.salary.elog.annotation.handle; + +import com.weaver.common.async.producer.client.AsyncClient; +import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.elog.annotation.Elog; +import com.weaver.common.elog.annotation.ElogPrimaryKey; +import com.weaver.common.elog.dao.QueryCurretValusMapper; +import com.weaver.common.elog.dto.LoggerContext; +import com.weaver.common.elog.util.LoggerTemplate; +import org.apache.commons.lang3.StringUtils; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.Signature; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Component; +import org.springframework.util.ReflectionUtils; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Date; +import java.util.List; +import java.util.Map; + + +/** + * @ClassName: LoggerTargetHandler + * @Description 从Spring扫描到的类中获取到Elog自定义注解类设置function属性 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +@Aspect +@Component +public class ElogHandler { + + @Autowired + ApplicationContext applicationContext; + + @Autowired + protected AsyncClient asyncClient; + + @Autowired + QueryCurretValusMapper queryCurretValusMapper; + + /** + * 切面写入日志 + */ + @Pointcut("@annotation(com.weaver.common.elog.annotation.Elog)" ) + public void writeLog(){} + @Around("writeLog()") + public Object writeLog(ProceedingJoinPoint pjp){ + Object[] args = pjp.getArgs(); + Signature signature = pjp.getSignature(); + MethodSignature methodSignature = (MethodSignature) signature; + Method method = methodSignature.getMethod(); + + Elog elog = method.getAnnotation(Elog.class); + String moduleName = elog.module(); + String funtionName = elog.function(); + String operateType = elog.operateType(); + String operateTypeName = elog.operateTypeName(); + boolean isLocal = elog.isLocal(); + Annotation[][] annos = method.getParameterAnnotations(); + + Object id = null; + int keyPosition = -1; + int index = 0; + + Class idClass = null; + // 获取主键id注解 + for(Annotation[] anno : annos) { + if(anno.length > 0) { + for(Annotation annotation : anno) { + if(annotation instanceof ElogPrimaryKey) { + idClass = method.getParameters()[index].getType(); + id = args[index]; + if(StringUtils.isEmpty(id+"")) { + id = idClass.cast(IdGenerator.generate() + ""); + } + keyPosition = index; + break; + } + } + } + index ++; + } + + LoggerContext loggerContext = null; + // 获取日志实体类 + for(Object arg: args) { + if(arg instanceof LoggerContext) { + loggerContext = (LoggerContext) arg; + break; + } + } + + if(loggerContext == null) { + loggerContext = new LoggerContext(); + } + + // 日志实体类的初始化 + // loggerContext.setOperateType("UPDATE"); + loggerContext.setFunctionName(funtionName); + loggerContext.setModuleName(moduleName); + loggerContext.setOperateType(operateType); + loggerContext.setOperateTypeName(operateTypeName); + loggerContext.setDate(new Date()); + loggerContext.setDevice("IOS"); + + String sql = elog.sql(); + String infoMethod = elog.infoMethod(); + + boolean isSql = false; + boolean isMethod = false; + Object currentClass = null; + Method infoMtd = null; + if(StringUtils.isNotEmpty(id+"")) { + if(StringUtils.isNotEmpty(sql)) { + isSql = true; + Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); + loggerContext.setOldValues(oldValue); + } else if(StringUtils.isNotEmpty(infoMethod)){ + isMethod = true; + currentClass = applicationContext.getBean(pjp.getTarget().getClass()); + // 获取方法 + infoMtd = ReflectionUtils.findMethod(pjp.getTarget().getClass(),infoMethod, idClass); + + // todo 为空的情况加异常提醒 + // 反射执行方法 + Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); + if(res != null) { + if(res instanceof List) { + loggerContext.setOldValueList((List) res); + } else { + loggerContext.setOldValues(res); + } + + } + } + } + + LoggerTemplate loggerTemplate = new LoggerTemplate(); + loggerTemplate.setFunction(funtionName); + loggerTemplate.setModule(moduleName); + loggerTemplate.setAsyncClient(asyncClient); + + Object result = null; + try { + args[keyPosition] = id; + result = pjp.proceed(args); + } catch (Throwable throwable) { + throwable.printStackTrace(); + } + if(isSql) { + Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); + loggerContext.setNewValues(oldValue); + } else if(isMethod) { + Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); + if(res != null) { + if(res instanceof List) { + loggerContext.setNewValueList((List) res); + } else { + loggerContext.setNewValues(res); + } + } + } + if(isLocal) + loggerTemplate.write(loggerContext); + else + loggerTemplate.write(loggerContext,false); + return result; + + } +} diff --git a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java new file mode 100644 index 000000000..2be2f35b6 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java @@ -0,0 +1,172 @@ +package com.engine.salary.elog.annotation.handle; + +import com.engine.salary.elog.annotation.ElogField; +import com.engine.salary.elog.annotation.ElogTable; +import com.engine.salary.elog.dto.TableColumnBean; +import com.engine.salary.elog.util.ElogUtils; +import com.weaver.common.elog.dao.TableCheckerMapper; +import com.weaver.common.elog.dto.DateTypeEnum; +import lombok.extern.slf4j.Slf4j; +import org.reflections.Reflections; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.aop.support.AopUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @ClassName: ElogTableScanner + * @Description 日志操作表扫描 + * @Author tanghj + * @Date 2021/3/12 13:31 + */ +@Slf4j +public class ElogTableScanner { + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Resource + private ApplicationContext applicationContext; + + @Autowired + private TableCheckerMapper tableCheckerMapper; + + @Override + public void run(String... args) throws Exception { + + // todo 需要考虑集群下，控制一台机器来跑 + scanElogTable(); + + } + + private void scanElogTable() { + // todo 是否还需要扫描Elog（因为可能不需要本地存储） ELogDetailTable， + Map tableBeans = this.applicationContext.getBeansWithAnnotation(ElogTable.class); + Reflections reflections = new Reflections("com.example.controller"); + Set> restController = reflections.getTypesAnnotatedWith(RestController.class); + + List baseColumns = new ArrayList<>(); + + Map> tableColumns = elogTableHandle(tableBeans,baseColumns); + + for(String tableName : tableColumns.keySet()) { + + // todo 需要处理明细表，如果没有直接初始化原始明细表，如果有加上自定义的 + List columns = tableColumns.get(tableName); + if(columns == null) { + columns = baseColumns; + } else { + columns.addAll(baseColumns); + } + tableCheck(tableName, columns); + } + + } + + private Map> elogTableHandle(Map tableBeans, List baseColumns) { + + + Map> tableMap = new HashMap<>(); + + + for (Map.Entry entry : tableBeans.entrySet()) {//遍历每个controller层 + + List list = new ArrayList<>(); + System.out.println(entry.getKey());//demo1Controller + Object value = entry.getValue(); + Class aClass = AopUtils.getTargetClass(value);//获取class + + ElogTable elogTable = aClass.getAnnotation(ElogTable.class); + + List fields = Arrays.asList(aClass.getDeclaredFields());//获取方法 + for (Field f : fields) { + + ElogField field = f.getAnnotation(ElogField.class); + if(field == null) { + continue; + } + + TableColumnBean tableColumnBean = new TableColumnBean(); + + tableColumnBean.setColumnName(f.getName()); + tableColumnBean.setColumnComment(field.comment()); + tableColumnBean.setColumnDefault(field.defaultValue()); + tableColumnBean.setFieldLength(field.length()); + tableColumnBean.setDataType(field.dataType()); + tableColumnBean.setNullable(field.isNull()); + list.add(tableColumnBean); + } + if(!ElogUtils.BASE_TABLE.equals(elogTable.module())) { + + tableMap.put(ElogUtils.getTableName(elogTable.module(), elogTable.function()), list); + } else { + baseColumns.addAll(list); + } + } + + return tableMap; + } + + private void tableCheck(String tableName, List columns) { + + List oldColumns = tableCheckerMapper.getTableStructure(tableName); + + // 表不存在 + if(oldColumns == null || oldColumns.size() == 0) { + createTable(tableName,columns ); + } else { + Map newcolMap = new HashMap<>(); + Map oldcolMap = new HashMap<>(); + + columns.stream().forEach(tableColumnBean -> newcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean)); + oldColumns.stream().forEach(tableColumnBean -> { + tableColumnBean.setDataType(ElogUtils.getEnumFromString(DateTypeEnum.class, tableColumnBean.getDataTypeStr())); + tableColumnBean.setNullable("YES".equalsIgnoreCase(tableColumnBean.getIsNullableStr())); + oldcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean); + }); + // 只增加或者修改，不删除字段 + for(String key : newcolMap.keySet()) { + if(oldcolMap.containsKey(key)) { + // 字段变动则修改 + if(!(newcolMap.get(key).toSql()).equals(oldcolMap.get(key).toSql())) + this.modifyColumn(tableName, newcolMap.get(key)); + } else { + this.addColumn(tableName, newcolMap.get(key)); + } + } + } + + } + + private void createTable(String tableName, List columns) { + StringBuilder sb = new StringBuilder("create table ").append(tableName).append(" ( "); + sb.append(columns.stream().map( bean -> bean.toSql()).collect(Collectors.joining(","))); + sb.append(")"); + logger.info("创建sql:{}",sb.toString()); + tableCheckerMapper.createElogTable(sb.toString()); + } + + private void addColumn(String tableName, TableColumnBean tableColumnBean) { + StringBuilder sb = new StringBuilder("alter table ") + .append(tableName).append(" ") + .append(" add ") + .append(" column ") + .append(tableColumnBean.toSql()); + logger.info("新增字段sql:{}",sb.toString()); + tableCheckerMapper.createElogTable(sb.toString()); + } + + private void modifyColumn(String tableName, TableColumnBean tableColumnBean) { + StringBuilder sb = new StringBuilder("alter table ") + .append(tableName).append(" ") + .append(" modify ") + .append(" column ") + .append(tableColumnBean.toSql()); + logger.info("修改字段sql:{}",sb.toString()); + tableCheckerMapper.createElogTable(sb.toString()); + } +} diff --git a/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java b/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java new file mode 100644 index 000000000..4a5c44d7b --- /dev/null +++ b/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java @@ -0,0 +1,40 @@ +package com.engine.salary.elog.annotation.handle; + +import com.weaver.common.elog.annotation.LoggerTarget; +import com.weaver.common.elog.util.LoggerTemplate; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Component; + +import java.util.Map; + + +/** + * @ClassName: LoggerTargetHandler + * @Description 从Spring扫描到的类中获取到LoggerTarget自定义注解类设置function属性 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ + +@Component +public class LoggerTargetHandler implements CommandLineRunner { + + @Autowired + ApplicationContext applicationContext; + + @Override + public void run(String... args) throws Exception { + Map loggtemplateMap = applicationContext.getBeansWithAnnotation(LoggerTarget.class); + + for(Object obj : loggtemplateMap.values()) { + if(obj instanceof LoggerTemplate) { + LoggerTarget loggerTarget = obj.getClass().getAnnotation(LoggerTarget.class); + ((LoggerTemplate) obj).setFunction(loggerTarget.function()); + ((LoggerTemplate) obj).setModule(StringUtils.isNotEmpty(loggerTarget.value()) ? loggerTarget.value() : loggerTarget.module()); + } + + } + } +} diff --git a/src/com/engine/salary/elog/dto/CancelContext.java b/src/com/engine/salary/elog/dto/CancelContext.java new file mode 100644 index 000000000..1c9771b69 --- /dev/null +++ b/src/com/engine/salary/elog/dto/CancelContext.java @@ -0,0 +1,25 @@ +package com.engine.salary.elog.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: CancelContext + * @Description 撤销实体类 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +@ApiModel("撤销实体类") +public class CancelContext { + + @ApiModelProperty("撤销参数") + private T cancleParams; + + public T getCancleParams() { + return cancleParams; + } + + public void setCancleParams(T cancleParams) { + this.cancleParams = cancleParams; + } +} diff --git a/src/com/engine/salary/elog/dto/DateTypeEnum.java b/src/com/engine/salary/elog/dto/DateTypeEnum.java new file mode 100644 index 000000000..9833cfa86 --- /dev/null +++ b/src/com/engine/salary/elog/dto/DateTypeEnum.java @@ -0,0 +1,16 @@ +package com.engine.salary.elog.dto; + +public enum DateTypeEnum { + VARCHAR, + BIGINT, + INT, + DATETIME, + TEXT, + LONGTEXT, + DOUBLE, + DECIMAL, + TINYINT, + FLOAT; + + +} diff --git a/src/com/engine/salary/elog/dto/LoggerContext.java b/src/com/engine/salary/elog/dto/LoggerContext.java new file mode 100644 index 000000000..248ce45d8 --- /dev/null +++ b/src/com/engine/salary/elog/dto/LoggerContext.java @@ -0,0 +1,408 @@ +package com.engine.salary.elog.dto; + +import com.engine.salary.elog.annotation.ElogField; +import com.engine.salary.elog.annotation.ElogTable; +import com.engine.salary.elog.util.ElogUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: LoggerContext + * @Description 日志实体类。支持通过泛型扩展日志字段 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +@ElogTable(module = ElogUtils.BASE_TABLE) +@ApiModel("日志实体类") +public class LoggerContext { + @ElogField(comment = "ID", dataType = DateTypeEnum.VARCHAR, isKey = true, isNull = false) + @ApiModelProperty("日志ID") + private long id; + + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 36,comment = "日志UUID") + @ApiModelProperty("日志UUID") + private String uuid; + + @ApiModelProperty("自定义日志字段信息") + private T customInfo; + @ElogField(dataType = DateTypeEnum.DATETIME,comment = "操作时间") + @ApiModelProperty("操作时间") + private Date date; + + @ElogField(dataType = DateTypeEnum.VARCHAR,length = 50,comment = "终端信息") + @ApiModelProperty("终端信息") + private String device; + + @ElogField(dataType = DateTypeEnum.VARCHAR,length = 50,comment = "操作人") + @ApiModelProperty("操作人") + private String operator; + + @ElogField(dataType = DateTypeEnum.VARCHAR,length = 100,comment = "操作人姓名") + @ApiModelProperty("操作人姓名") + private String operatorName; + + @ElogField(dataType = DateTypeEnum.VARCHAR,length = 10,comment = "租户id") + @ApiModelProperty("租户id") + private String tenant_key; + + /** + * 要操作的对象在表中的主键值 + */ + @ElogField(dataType = DateTypeEnum.VARCHAR,length = 50,comment = "操作目标id") + @ApiModelProperty("操作目标id") + private String targetId; + + @ElogField(dataType = DateTypeEnum.TEXT ,comment = "操作目标名称") + @ApiModelProperty("操作目标名称（用于显示）") + private String targetName; + + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 100,comment = "模块") + @ApiModelProperty("目标对象类型（大分类，模块，服务）") + private String moduleName;// 模块 + + /** + * 目标对象类型（小分类，模块/服务下的子功能。子项目） + * 数据存储是以模块名_子项目名作为最基本的存储单元 + * 如果是子项目下的子项目 命名为：子项目名_子项目名_子项目名（全部小写） + */ + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 100,comment = "服务（方法）") + @ApiModelProperty("目标对象类型（小分类，模块/服务下的子功能。子项目）") + private String functionName; + + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 100,comment = "访问接口名") + @ApiModelProperty("访问接口名") + private String interfaceName; + + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 50,comment = "操作类型") + @ApiModelProperty("操作类型（增删改查等）") + private String operateType; + + @ElogField(dataType = DateTypeEnum.TEXT,comment = "操作类型") + @ApiModelProperty("操作类型名称") + private String operateTypeName; + + /** + * 每个TableChangeBean 为一张表，支持记录多张表的前后值 + */ + @ApiModelProperty("修改前、后的值") + private List changeValues;// 操作表名,[字段名,值] + + @ElogField(dataType = DateTypeEnum.TEXT,comment = "操作类型") + @ApiModelProperty("操作详细说明") + private String operatedesc; + + @ApiModelProperty("涉及的相关参数") + private Map params; + + /*@ApiModelProperty("主日志") + private String mainId;//当作为主表，belongMainId不赋值 + + @ApiModelProperty("从表日志") + private String belongMainId;*/ + + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 50,comment = "操作IP") + @ApiModelProperty("操作IP") + private String clientIp; + + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 50,comment = "分组") + @ApiModelProperty("分组") + private String groupId; + + /*@ApiModelProperty("是否明显表") + private boolean isDetail;*/ + + @ElogField(dataType = DateTypeEnum.TEXT, comment = "分组标题") + @ApiModelProperty("分组标题") + private int groupNameLabel; + + @ApiModelProperty("重做业务接口") + private String redoService; + + @ElogField(dataType = DateTypeEnum.LONGTEXT, comment = "重做参数") + @ApiModelProperty("重做参数") + private RedoContext redoContext; + + @ElogField(dataType = DateTypeEnum.VARCHAR, length = 200, comment = "撤销业务接口") + @ApiModelProperty("撤销业务接口") + private String cancelService; + + @ElogField(dataType = DateTypeEnum.LONGTEXT, comment = "撤销参数") + @ApiModelProperty("撤销参数") + private CancelContext cancelContext; + + @ApiModelProperty("日志明细列表（值变化列表-自动赋值、或者自定义字段）") + private List detailContexts; + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public T getCustomInfo() { + return customInfo; + } + + public void setCustomInfo(T customInfo) { + this.customInfo = customInfo; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public String getDevice() { + return device; + } + + public void setDevice(String device) { + this.device = device; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + + public String getTenant_key() { + return tenant_key; + } + + public void setTenant_key(String tenant_key) { + this.tenant_key = tenant_key; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public String getTargetName() { + return targetName; + } + + public void setTargetName(String targetName) { + this.targetName = targetName; + } + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public String getFunctionName() { + return functionName; + } + + public void setFunctionName(String functionName) { + this.functionName = functionName; + } + + public String getInterfaceName() { + return interfaceName; + } + + public void setInterfaceName(String interfaceName) { + this.interfaceName = interfaceName; + } + + public String getOperateType() { + return operateType; + } + + public void setOperateType(String operateType) { + this.operateType = operateType; + } + + public List getChangeValues() { + return changeValues; + } + + public void setChangeValues(List changeValues) { + this.changeValues = changeValues; + } + + public String getOperatedesc() { + return operatedesc; + } + + public void setOperatedesc(String operatedesc) { + this.operatedesc = operatedesc; + } + + public Map getParams() { + return params; + } + + public void setParams(Map params) { + this.params = params; + } + + /*public String getMainId() { + return mainId; + } + + public void setMainId(String mainId) { + this.mainId = mainId; + } + + public String getBelongMainId() { + return belongMainId; + } + + public void setBelongMainId(String belongMainId) { + this.belongMainId = belongMainId; + }*/ + + public String getClientIp() { + return clientIp; + } + + public void setClientIp(String clientIp) { + this.clientIp = clientIp; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + +/* public boolean isDetail() { + return isDetail; + } + + public void setDetail(boolean detail) { + isDetail = detail; + }*/ + + public int getGroupNameLabel() { + return groupNameLabel; + } + + public void setGroupNameLabel(int groupNameLabel) { + this.groupNameLabel = groupNameLabel; + } + + public String getRedoService() { + return redoService; + } + + public void setRedoService(String redoService) { + this.redoService = redoService; + } + + public RedoContext getRedoContext() { + return redoContext; + } + + public void setRedoContext(RedoContext redoContext) { + this.redoContext = redoContext; + } + + public CancelContext getCancelContext() { + return cancelContext; + } + + public void setCancelContext(CancelContext cancelContext) { + this.cancelContext = cancelContext; + } + + public String getCancelService() { + return cancelService; + } + public void setCancelService(String cancelService) { + this.cancelService = cancelService; + } + + public List getDetailContexts() { + return detailContexts; + } + + public void setDetailContexts(List detailContexts) { + this.detailContexts = detailContexts; + } + + public String getOperatorName() { + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public void setOldValues(Object object) { + TableChangeBean bean = new TableChangeBean(); + bean.setOldValue(object); + getChangeList().add(bean); + } + + public void setOldValueList(List list) { + if(list != null) + list.stream().forEach(obj -> setOldValues(obj)); + } + + public void setNewValueList(List list) { + if(list != null) + list.stream().forEach(obj -> setNewValues(obj)); + } + + public void setNewValues(Object object) { + List list = getChangeList(); + + boolean handled = false; + for(TableChangeBean bean : list) { + if(bean.getNewValue() == null) { + bean.setNewValue(object); + handled = true; + break; + } + } + if(!handled) { + TableChangeBean bean = new TableChangeBean(); + bean.setOldValue(object); + list.add(bean); + } + } + + public List getChangeList() { + + if(this.changeValues == null) { + this.changeValues = new ArrayList<>(); + } + + return this.changeValues; + + } + + public String getOperateTypeName() { + return operateTypeName; + } + + public void setOperateTypeName(String operateTypeName) { + this.operateTypeName = operateTypeName; + } +} + diff --git a/src/com/engine/salary/elog/dto/LoggerDetailContext.java b/src/com/engine/salary/elog/dto/LoggerDetailContext.java new file mode 100644 index 000000000..8dd6ec7d9 --- /dev/null +++ b/src/com/engine/salary/elog/dto/LoggerDetailContext.java @@ -0,0 +1,102 @@ +package com.engine.salary.elog.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: ValueChangeBean + * @Description 值变化实体类（自动将表字段值变更类转换为该类） + * @Author tanghj + * @Date 2021/3/9 11:06 + */ +@ApiModel("值变化实体类") +public class LoggerDetailContext { + + @ApiModelProperty("同一个bean转换的数据，uuid相同，作为区分标识") + private String uuid; + + @ApiModelProperty("表名") + private String tableName; + + @ApiModelProperty("字段名") + private String fieldName; + + @ApiModelProperty("更新后的值") + private String newValue; + + @ApiModelProperty("更新前的值") + private String oldValue; + + @ApiModelProperty("字段描述") + private String fieldDesc; + + @ApiModelProperty("字段展示顺序") + private int showorder; + + @ApiModelProperty("自定义字段") + private T customDetailInfo; + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getFieldName() { + return fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } + + public String getNewValue() { + return newValue; + } + + public void setNewValue(String newValue) { + this.newValue = newValue; + } + + public String getOldValue() { + return oldValue; + } + + public void setOldValue(String oldValue) { + this.oldValue = oldValue; + } + + public String getFieldDesc() { + return fieldDesc; + } + + public void setFieldDesc(String fieldDesc) { + this.fieldDesc = fieldDesc; + } + + public int getShoworder() { + return showorder; + } + + public void setShoworder(int showorder) { + this.showorder = showorder; + } + + public T getCustomDetailInfo() { + return customDetailInfo; + } + + public void setCustomDetailInfo(T customDetailInfo) { + this.customDetailInfo = customDetailInfo; + } +} diff --git a/src/com/engine/salary/elog/dto/RedoContext.java b/src/com/engine/salary/elog/dto/RedoContext.java new file mode 100644 index 000000000..749643aed --- /dev/null +++ b/src/com/engine/salary/elog/dto/RedoContext.java @@ -0,0 +1,24 @@ +package com.engine.salary.elog.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: RedoContext + * @Description 重做实体类 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +@ApiModel("重做实体类") +public class RedoContext { + @ApiModelProperty("重做参数") + private T redoParams; + + public T getRedoParams() { + return redoParams; + } + + public void setRedoParams(T redoParams) { + this.redoParams = redoParams; + } +} diff --git a/src/com/engine/salary/elog/dto/TableChangeBean.java b/src/com/engine/salary/elog/dto/TableChangeBean.java new file mode 100644 index 000000000..86cfdb0c3 --- /dev/null +++ b/src/com/engine/salary/elog/dto/TableChangeBean.java @@ -0,0 +1,53 @@ +package com.engine.salary.elog.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: TableChangeBean + * @Description 表更新前后值类 + * @Author tanghj + * @Date 2021/3/8 15:58 + */ +@ApiModel("表更新前后值类") +public class TableChangeBean { + + @ApiModelProperty("表名") + private String tableName; + + /** + * 泛型必须是具体的实体类 + */ + @ApiModelProperty("更新前的值") + private T oldValue; + + /** + * 泛型必须是具体的实体类 + */ + @ApiModelProperty("更新后的值") + private T newValue; + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public T getOldValue() { + return oldValue; + } + + public void setOldValue(T oldValue) { + this.oldValue = oldValue; + } + + public T getNewValue() { + return newValue; + } + + public void setNewValue(T newValue) { + this.newValue = newValue; + } +} diff --git a/src/com/engine/salary/elog/dto/TableColumnBean.java b/src/com/engine/salary/elog/dto/TableColumnBean.java new file mode 100644 index 000000000..e4c635cd0 --- /dev/null +++ b/src/com/engine/salary/elog/dto/TableColumnBean.java @@ -0,0 +1,155 @@ +package com.engine.salary.elog.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: TableColumnBean + * @Description 表字段类 + * @Author tanghj + * @Date 2021/3/12 11:44 + */ +@ApiModel("表字段类") +public class TableColumnBean { + + @ApiModelProperty("列名") + private String columnName; + + /** + * varchar(20) + */ + @ApiModelProperty("数据类型") + private String columnType; + + @ApiModelProperty("字段类型-字符串") + private String dataTypeStr; + + @ApiModelProperty("字段类型") + private DateTypeEnum dataType; + + @ApiModelProperty("长度") + private long fieldLength; + + @ApiModelProperty("是否为空") + private boolean isNullable; + + @ApiModelProperty("是否为空-字符串") + private String isNullableStr; + + @ApiModelProperty("默认值") + private Object columnDefault; + + @ApiModelProperty("备注") + private String columnComment; + + public String getColumnName() { + return columnName; + } + + public void setColumnName(String columnName) { + this.columnName = columnName; + } + + public String getColumnType() { + return columnType; + } + + public void setColumnType(String columnType) { + this.columnType = columnType; + } + + public DateTypeEnum getDataType() { + return dataType; + } + + public void setDataType(DateTypeEnum dataType) { + this.dataType = dataType; + } + + public long getFieldLength() { + return fieldLength; + } + + public void setFieldLength(long fieldLength) { + this.fieldLength = fieldLength; + } + + public boolean isNullable() { + return isNullable; + } + + public void setNullable(boolean nullable) { + isNullable = nullable; + } + + public Object getColumnDefault() { + return columnDefault; + } + + public void setColumnDefault(Object columnDefault) { + this.columnDefault = columnDefault; + } + + public String getColumnComment() { + return columnComment; + } + + public void setColumnComment(String columnComment) { + this.columnComment = columnComment; + } + + public String getDataTypeStr() { + return dataTypeStr; + } + + public void setDataTypeStr(String dataTypeStr) { + this.dataTypeStr = dataTypeStr; + } + + public String getIsNullableStr() { + return isNullableStr; + } + + public void setIsNullableStr(String isNullableStr) { + this.isNullableStr = isNullableStr; + } + + public boolean equals(TableColumnBean tableColumnBean) { + + return this.toSql().equals(tableColumnBean.toSql()); + } + + public String toSql() { + + StringBuilder sb = new StringBuilder(this.columnName.toLowerCase()).append(" "); + + if (this.dataType == null) { + return "类型为空"; + } + switch (this.dataType) { + case BIGINT: + case INT: + case TEXT: + case LONGTEXT: + case DATETIME: + case FLOAT: + case TINYINT: + case DOUBLE: + sb.append(this.dataType.name().toLowerCase()).append(" "); + break; + case VARCHAR: + sb.append(this.dataType.name().toLowerCase()).append("(").append(this.fieldLength).append(") "); + break; + case DECIMAL: + long length = (this.fieldLength < 0 || this.fieldLength > 38) ? 0 : this.fieldLength; + sb.append(this.dataType.name().toLowerCase()).append("(").append(38 - length).append(",").append(length).append(") "); + break; + default: + sb.append("varchar").append("(").append(10).append(") "); + } + + sb.append("comment ").append("'").append(this.columnComment).append("' "); + + return sb.toString(); + } +} diff --git a/src/com/engine/salary/elog/util/ElogUtils.java b/src/com/engine/salary/elog/util/ElogUtils.java new file mode 100644 index 000000000..d2203f7ab --- /dev/null +++ b/src/com/engine/salary/elog/util/ElogUtils.java @@ -0,0 +1,50 @@ +package com.engine.salary.elog.util; + +import com.engine.salary.elog.dto.DateTypeEnum; + +/** + * @ClassName: ElogUtils + * @Description TODO + * @Author tanghj + * @Date 2021/3/12 14:17 + */ +public class ElogUtils { + + private static final String TABLE_SPACER = "_"; + private static final String TABLE_SUFFIX = "logs"; + private static final String DETAIL_TABLE_SUFFIX = "detail"; + public static final String BASE_TABLE = "BASE_ELOG_TABLE"; + + + public static String getTableName(String module, String function) { + return getTableName(module, function, false); + } + + public static String getTableName(String module, String function, boolean isDetail){ + + return module + TABLE_SPACER + function + TABLE_SUFFIX + (isDetail ? DETAIL_TABLE_SUFFIX : ""); + } + + /** + * String 转枚举 + * @param c + * @param string + * @param + * @return + */ + public static > T getEnumFromString(Class c, String string) { + if (c != null && string != null) { + try { + return Enum.valueOf(c, string.trim().toUpperCase()); + } catch (IllegalArgumentException ex) { + } + } + return null; + } + + public static void main(String[] args) { + System.out.println(DateTypeEnum.BIGINT.name()); + DateTypeEnum columnTypeEnum = getEnumFromString(DateTypeEnum.class, "varchar"); + System.out.println(columnTypeEnum.equals(DateTypeEnum.VARCHAR)); + } +} diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java new file mode 100644 index 000000000..1041e9375 --- /dev/null +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -0,0 +1,164 @@ +package com.engine.salary.elog.util; + +import com.alibaba.fastjson.JSONObject; +import com.weaver.common.async.bean.AsyncBean; +import com.weaver.common.async.producer.client.AsyncClient; +import com.weaver.common.elog.dto.LoggerContext; +import com.weaver.common.elog.dto.LoggerDetailContext; +import com.weaver.common.elog.dto.TableChangeBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.beans.factory.annotation.Autowired; + +import java.lang.reflect.Field; +import java.util.*; + +/** + * @ClassName: LoggerTemplate + * @Description 日志基本功能类 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +public class LoggerTemplate { + protected String function = "common"; + + protected String module; + + protected String logCenterQueue = "Elog_cneterlogQueue"; + + protected String localQueue; + + @Autowired + protected AsyncClient asyncClient; + /** + * 写入日志消息队列 + * @param context 日志实体 + */ + public void write(LoggerContext context){ + this.write(context, true); + } + + /** + * 写入日志消息队列 + * @param context 日志实体 + * @param isLocal true 存储本地， false不存储本地 + */ + public void write(LoggerContext context, boolean isLocal){ + AsyncBean asyncBean = new AsyncBean<>(); + handleContext(context); + asyncBean.setMessage(context); + asyncBean.setQueue(logCenterQueue); + asyncClient.send(asyncBean); + if(isLocal) { + asyncBean.setQueue(localQueue); + asyncClient.send(asyncBean); + } + } + + private void handleContext(LoggerContext context) { + context.setModuleName(module); + context.setFunctionName(function); + + List changeBeans = context.getChangeValues(); + + List valueChangeList = new ArrayList<>(); + int showOrder = 0; + if(changeBeans != null) + for(TableChangeBean changeBean : changeBeans) { + if(changeBean != null && (changeBean.getNewValue() != null || changeBean.getOldValue() != null)) { + ApiModel apiModel = null; + JSONObject newJo = new JSONObject(); + JSONObject oldJo = new JSONObject(); + JSONObject valueChange = JSONObject.parseObject(JSONObject.toJSONString(changeBean)); + if(changeBean.getNewValue() != null) { + apiModel = changeBean.getNewValue().getClass().getAnnotation(ApiModel.class); + newJo = valueChange.getJSONObject("newValue"); + } else { + apiModel = changeBean.getOldValue().getClass().getAnnotation(ApiModel.class); + } + if(changeBean.getOldValue() != null) { + oldJo = valueChange.getJSONObject("oldValue"); + } + if(apiModel != null) { + Field[] fields = changeBean.getNewValue().getClass().getDeclaredFields(); + for(Field field : fields) { + ApiModelProperty apiModelProperty = field.getAnnotation(ApiModelProperty.class); + LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setFieldName(field.getName()); + valueChangeBean.setFieldDesc(apiModelProperty.value()); + valueChangeBean.setNewValue(newJo.getString(field.getName())); + valueChangeBean.setOldValue(oldJo.getString(field.getName())); + valueChangeBean.setShoworder(showOrder++); + valueChangeList.add(valueChangeBean); + } + } else { + Set keys = new HashSet<>(); + for(String key : newJo.keySet()) { + keys.add(key); + LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setFieldName(key); + valueChangeBean.setFieldDesc(key); + valueChangeBean.setNewValue(newJo.getString(key)); + valueChangeBean.setOldValue(oldJo.getString(key)); + valueChangeBean.setShoworder(showOrder++); + valueChangeList.add(valueChangeBean); + } + for(String key : oldJo.keySet()) { + if(keys.contains(key)) + continue; + keys.add(key); + LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setFieldName(key); + valueChangeBean.setFieldDesc(key); + valueChangeBean.setNewValue(newJo.getString(key)); + valueChangeBean.setOldValue(oldJo.getString(key)); + valueChangeBean.setShoworder(showOrder++); + valueChangeList.add(valueChangeBean); + } + } + } + } + + if(valueChangeList.size() > 0) + context.setDetailContexts(valueChangeList); + } + + public String getFunction() { + return function; + } + + public void setFunction(String function) { + this.function = function; + } + + public String getModule() { + return module; + } + + /** + * 获取日志实体类 + * @return + */ + public LoggerContext getContext() { + + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUuid(UUID.randomUUID().toString().replace("-","")); + loggerContext.setModuleName(this.module); + loggerContext.setFunctionName(this.function); + + return loggerContext; + + } + + public void setModule(String module) { + this.localQueue = module + "LocalQueue"; + this.module = module; + } + + public void setAsyncClient(AsyncClient asyncClient) { + this.asyncClient = asyncClient; + } +} diff --git a/src/com/engine/salary/elog/util/LoggerTemplateBuilder.java b/src/com/engine/salary/elog/util/LoggerTemplateBuilder.java new file mode 100644 index 000000000..14ae29945 --- /dev/null +++ b/src/com/engine/salary/elog/util/LoggerTemplateBuilder.java @@ -0,0 +1,21 @@ +package com.engine.salary.elog.util; + +/** + * @ClassName: LoggerTemplateBuilder + * @Description 日志基本类构造器 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +public class LoggerTemplateBuilder { + + public static LoggerTemplate build(String module){ + return build(module, "common"); + } + public static LoggerTemplate build(String module, String function){ + LoggerTemplate loggerTemplate = new LoggerTemplate(); + loggerTemplate.setFunction(function); + loggerTemplate.setModule(module); + + return loggerTemplate; + } +} From a5eb86ab068b7f5f36305be0e1a6e9eaad7f1303 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 21 Dec 2023 13:33:21 +0800 Subject: [PATCH 020/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E9=80=82=E9=85=8D=E7=A6=8F=E5=88=A9=E5=9F=BA?= =?UTF-8?q?=E6=95=B0=E4=B8=AA=E4=BA=BA=E5=92=8C=E5=85=AC=E5=8F=B8=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SIAccountServiceImpl.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 1385b84d7..cbed96243 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2540,33 +2540,33 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { //社保个人（生育保险个人、工伤保险个人、失业保险个人、养老保险个人、医疗保险个人） for (ICategoryPO po : socialWelPerList) { result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) - + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "socialPer"); + + SalaryI18nUtil.getI18nLabel(0, "个人"), po.getId() + "socialPer"); } //住房公积金个人、补充住房公积金个人 for (ICategoryPO po : fundWelPerList) { result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) - + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "fundPer"); + + SalaryI18nUtil.getI18nLabel(0, "个人"), po.getId() + "fundPer"); } //其他个人（比如企业年金个人） for (ICategoryPO po : otherWelPerList) { result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) - + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "otherPer"); + + SalaryI18nUtil.getI18nLabel(0, "个人"), po.getId() + "otherPer"); } //社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位） for (ICategoryPO po : socialWelComList) { result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) - + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "socialCom"); + + SalaryI18nUtil.getI18nLabel(0, "单位"), po.getId() + "socialCom"); } //住房公积金单位、补充住房公积金单位 for (ICategoryPO po : fundWelComList) { result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) - + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "fundCom"); + + SalaryI18nUtil.getI18nLabel(0, "单位"), po.getId() + "fundCom"); } //其他单位（比如企业年金单位） for (ICategoryPO po : otherWelComList) { result.put(Util.formatMultiLang(po.getInsuranceName(), String.valueOf(user.getLanguage())) - + SalaryI18nUtil.getI18nLabel(0, "申报基数"), po.getId() + "otherCom"); + + SalaryI18nUtil.getI18nLabel(0, "单位"), po.getId() + "otherCom"); } return result; @@ -2621,11 +2621,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { String billMonth = importParam.getBillMonth(); - Map welColumnNameCodeMap = welColumnNameCodeMap(InsuranceAccountDetailParam.builder() - .billMonth(billMonth) - .paymentOrganization(importParam.getPaymentOrganization()) - .paymentStatus(PaymentStatusEnum.COMMON.getValue()) - .build()); +// Map welColumnNameCodeMap = welColumnNameCodeMap(InsuranceAccountDetailParam.builder() +// .billMonth(billMonth) +// .paymentOrganization(importParam.getPaymentOrganization()) +// .paymentStatus(PaymentStatusEnum.COMMON.getValue()) +// .build()); + Map welColumnNameCodeMap = new HashMap<>(); //存储待更新的InsuranceAccountDetailPO数据 List addCompareList = new ArrayList<>(); //记录待删除hrsa_excel_bill_detail.id @@ -2647,6 +2648,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (taxAgentPoList.size() == 1) { paymentOrganization = taxAgentPoList.get(0).getId(); + welColumnNameCodeMap = welColumnNameCodeMap(InsuranceAccountDetailParam.builder() + .billMonth(billMonth) + .paymentOrganization(paymentOrganization.toString()) + .paymentStatus(PaymentStatusEnum.COMMON.getValue()) + .build()); } else { isError = true; Map errorMessageMap = Maps.newHashMap(); From 83a41da11d5c5708c9c57f666797efcedfb8a494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 21 Dec 2023 14:30:21 +0800 Subject: [PATCH 021/169] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/elog/annotation/ElogTable.java | 2 +- .../salary/elog/annotation/LoggerTarget.java | 6 +- .../elog/annotation/handle/ElogHandler.java | 354 +++++++++--------- .../annotation/handle/ElogTableScanner.java | 46 +-- .../handle/LoggerTargetHandler.java | 78 ++-- .../elog/async/LoggerMessageListener.java | 31 ++ .../engine/salary/elog/config/ELogCache.java | 25 ++ .../salary/elog/config/ELogTableChecker.java | 44 +++ .../service/ApplicationContextProvider.java | 67 ++++ .../salary/elog/service/LocalElogService.java | 74 ++++ .../salary/elog/util/LoggerTemplate.java | 142 ++++--- .../formlua/entity/parameter/ExcelFuncs.java | 2 +- .../entity/parameter/FuncDescUtil.java | 2 +- .../mapper/elog/LocalElogDaoMapper.java | 36 ++ .../salary/mapper/elog/LocalElogDaoMapper.xml | 41 ++ .../mapper/elog/QueryCurretValusMapper.java | 8 + .../mapper/elog/QueryCurretValusMapper.xml | 9 + .../mapper/elog/TableCheckerMapper.java | 20 + .../salary/mapper/elog/TableCheckerMapper.xml | 79 ++++ 19 files changed, 735 insertions(+), 331 deletions(-) create mode 100644 src/com/engine/salary/elog/async/LoggerMessageListener.java create mode 100644 src/com/engine/salary/elog/config/ELogCache.java create mode 100644 src/com/engine/salary/elog/config/ELogTableChecker.java create mode 100644 src/com/engine/salary/elog/service/ApplicationContextProvider.java create mode 100644 src/com/engine/salary/elog/service/LocalElogService.java create mode 100644 src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java create mode 100644 src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml create mode 100644 src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java create mode 100644 src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml create mode 100644 src/com/engine/salary/mapper/elog/TableCheckerMapper.java create mode 100644 src/com/engine/salary/mapper/elog/TableCheckerMapper.xml diff --git a/src/com/engine/salary/elog/annotation/ElogTable.java b/src/com/engine/salary/elog/annotation/ElogTable.java index 28f5f853b..a236b5b6e 100644 --- a/src/com/engine/salary/elog/annotation/ElogTable.java +++ b/src/com/engine/salary/elog/annotation/ElogTable.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) -@Component + public @interface ElogTable { String module(); diff --git a/src/com/engine/salary/elog/annotation/LoggerTarget.java b/src/com/engine/salary/elog/annotation/LoggerTarget.java index c1e337ca3..701d4f8e6 100644 --- a/src/com/engine/salary/elog/annotation/LoggerTarget.java +++ b/src/com/engine/salary/elog/annotation/LoggerTarget.java @@ -1,7 +1,5 @@ package com.engine.salary.elog.annotation; -import org.springframework.core.annotation.AliasFor; - import java.lang.annotation.*; /** @@ -14,10 +12,10 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) public @interface LoggerTarget { - @AliasFor("module") +// @AliasFor("module") String value() default ""; - @AliasFor("value") +// @AliasFor("value") String module() default ""; String function() default "common"; diff --git a/src/com/engine/salary/elog/annotation/handle/ElogHandler.java b/src/com/engine/salary/elog/annotation/handle/ElogHandler.java index 815191606..7cb1dda25 100644 --- a/src/com/engine/salary/elog/annotation/handle/ElogHandler.java +++ b/src/com/engine/salary/elog/annotation/handle/ElogHandler.java @@ -1,177 +1,177 @@ -package com.engine.salary.elog.annotation.handle; - -import com.weaver.common.async.producer.client.AsyncClient; -import com.weaver.common.distribution.genid.IdGenerator; -import com.weaver.common.elog.annotation.Elog; -import com.weaver.common.elog.annotation.ElogPrimaryKey; -import com.weaver.common.elog.dao.QueryCurretValusMapper; -import com.weaver.common.elog.dto.LoggerContext; -import com.weaver.common.elog.util.LoggerTemplate; -import org.apache.commons.lang3.StringUtils; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.Signature; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; -import org.springframework.util.ReflectionUtils; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; -import java.util.Map; - - -/** - * @ClassName: LoggerTargetHandler - * @Description 从Spring扫描到的类中获取到Elog自定义注解类设置function属性 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -@Aspect -@Component -public class ElogHandler { - - @Autowired - ApplicationContext applicationContext; - - @Autowired - protected AsyncClient asyncClient; - - @Autowired - QueryCurretValusMapper queryCurretValusMapper; - - /** - * 切面写入日志 - */ - @Pointcut("@annotation(com.weaver.common.elog.annotation.Elog)" ) - public void writeLog(){} - @Around("writeLog()") - public Object writeLog(ProceedingJoinPoint pjp){ - Object[] args = pjp.getArgs(); - Signature signature = pjp.getSignature(); - MethodSignature methodSignature = (MethodSignature) signature; - Method method = methodSignature.getMethod(); - - Elog elog = method.getAnnotation(Elog.class); - String moduleName = elog.module(); - String funtionName = elog.function(); - String operateType = elog.operateType(); - String operateTypeName = elog.operateTypeName(); - boolean isLocal = elog.isLocal(); - Annotation[][] annos = method.getParameterAnnotations(); - - Object id = null; - int keyPosition = -1; - int index = 0; - - Class idClass = null; - // 获取主键id注解 - for(Annotation[] anno : annos) { - if(anno.length > 0) { - for(Annotation annotation : anno) { - if(annotation instanceof ElogPrimaryKey) { - idClass = method.getParameters()[index].getType(); - id = args[index]; - if(StringUtils.isEmpty(id+"")) { - id = idClass.cast(IdGenerator.generate() + ""); - } - keyPosition = index; - break; - } - } - } - index ++; - } - - LoggerContext loggerContext = null; - // 获取日志实体类 - for(Object arg: args) { - if(arg instanceof LoggerContext) { - loggerContext = (LoggerContext) arg; - break; - } - } - - if(loggerContext == null) { - loggerContext = new LoggerContext(); - } - - // 日志实体类的初始化 - // loggerContext.setOperateType("UPDATE"); - loggerContext.setFunctionName(funtionName); - loggerContext.setModuleName(moduleName); - loggerContext.setOperateType(operateType); - loggerContext.setOperateTypeName(operateTypeName); - loggerContext.setDate(new Date()); - loggerContext.setDevice("IOS"); - - String sql = elog.sql(); - String infoMethod = elog.infoMethod(); - - boolean isSql = false; - boolean isMethod = false; - Object currentClass = null; - Method infoMtd = null; - if(StringUtils.isNotEmpty(id+"")) { - if(StringUtils.isNotEmpty(sql)) { - isSql = true; - Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); - loggerContext.setOldValues(oldValue); - } else if(StringUtils.isNotEmpty(infoMethod)){ - isMethod = true; - currentClass = applicationContext.getBean(pjp.getTarget().getClass()); - // 获取方法 - infoMtd = ReflectionUtils.findMethod(pjp.getTarget().getClass(),infoMethod, idClass); - - // todo 为空的情况加异常提醒 - // 反射执行方法 - Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); - if(res != null) { - if(res instanceof List) { - loggerContext.setOldValueList((List) res); - } else { - loggerContext.setOldValues(res); - } - - } - } - } - - LoggerTemplate loggerTemplate = new LoggerTemplate(); - loggerTemplate.setFunction(funtionName); - loggerTemplate.setModule(moduleName); - loggerTemplate.setAsyncClient(asyncClient); - - Object result = null; - try { - args[keyPosition] = id; - result = pjp.proceed(args); - } catch (Throwable throwable) { - throwable.printStackTrace(); - } - if(isSql) { - Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); - loggerContext.setNewValues(oldValue); - } else if(isMethod) { - Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); - if(res != null) { - if(res instanceof List) { - loggerContext.setNewValueList((List) res); - } else { - loggerContext.setNewValues(res); - } - } - } - if(isLocal) - loggerTemplate.write(loggerContext); - else - loggerTemplate.write(loggerContext,false); - return result; - - } -} +//package com.engine.salary.elog.annotation.handle; +// +//import com.weaver.common.async.producer.client.AsyncClient; +//import com.weaver.common.distribution.genid.IdGenerator; +//import com.weaver.common.elog.annotation.Elog; +//import com.weaver.common.elog.annotation.ElogPrimaryKey; +//import com.weaver.common.elog.dao.QueryCurretValusMapper; +//import com.weaver.common.elog.dto.LoggerContext; +//import com.weaver.common.elog.util.LoggerTemplate; +//import org.apache.commons.lang3.StringUtils; +//import org.aspectj.lang.ProceedingJoinPoint; +//import org.aspectj.lang.Signature; +//import org.aspectj.lang.annotation.Around; +//import org.aspectj.lang.annotation.Aspect; +//import org.aspectj.lang.annotation.Pointcut; +//import org.aspectj.lang.reflect.MethodSignature; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.ApplicationContext; +//import org.springframework.stereotype.Component; +//import org.springframework.util.ReflectionUtils; +// +//import java.lang.annotation.Annotation; +//import java.lang.reflect.Method; +//import java.util.Date; +//import java.util.List; +//import java.util.Map; +// +// +///** +// * @ClassName: LoggerTargetHandler +// * @Description 从Spring扫描到的类中获取到Elog自定义注解类设置function属性 +// * @Author tanghj +// * @Date 2021/2/10 14:18 +// */ +//@Aspect +// +//public class ElogHandler { +// +// @Autowired +// ApplicationContext applicationContext; +// +// @Autowired +// protected AsyncClient asyncClient; +// +// @Autowired +// QueryCurretValusMapper queryCurretValusMapper; +// +// /** +// * 切面写入日志 +// */ +// @Pointcut("@annotation(com.weaver.common.elog.annotation.Elog)" ) +// public void writeLog(){} +// @Around("writeLog()") +// public Object writeLog(ProceedingJoinPoint pjp){ +// Object[] args = pjp.getArgs(); +// Signature signature = pjp.getSignature(); +// MethodSignature methodSignature = (MethodSignature) signature; +// Method method = methodSignature.getMethod(); +// +// Elog elog = method.getAnnotation(Elog.class); +// String moduleName = elog.module(); +// String funtionName = elog.function(); +// String operateType = elog.operateType(); +// String operateTypeName = elog.operateTypeName(); +// boolean isLocal = elog.isLocal(); +// Annotation[][] annos = method.getParameterAnnotations(); +// +// Object id = null; +// int keyPosition = -1; +// int index = 0; +// +// Class idClass = null; +// // 获取主键id注解 +// for(Annotation[] anno : annos) { +// if(anno.length > 0) { +// for(Annotation annotation : anno) { +// if(annotation instanceof ElogPrimaryKey) { +// idClass = method.getParameters()[index].getType(); +// id = args[index]; +// if(StringUtils.isEmpty(id+"")) { +// id = idClass.cast(IdGenerator.generate() + ""); +// } +// keyPosition = index; +// break; +// } +// } +// } +// index ++; +// } +// +// LoggerContext loggerContext = null; +// // 获取日志实体类 +// for(Object arg: args) { +// if(arg instanceof LoggerContext) { +// loggerContext = (LoggerContext) arg; +// break; +// } +// } +// +// if(loggerContext == null) { +// loggerContext = new LoggerContext(); +// } +// +// // 日志实体类的初始化 +// // loggerContext.setOperateType("UPDATE"); +// loggerContext.setFunctionName(funtionName); +// loggerContext.setModuleName(moduleName); +// loggerContext.setOperateType(operateType); +// loggerContext.setOperateTypeName(operateTypeName); +// loggerContext.setDate(new Date()); +// loggerContext.setDevice("IOS"); +// +// String sql = elog.sql(); +// String infoMethod = elog.infoMethod(); +// +// boolean isSql = false; +// boolean isMethod = false; +// Object currentClass = null; +// Method infoMtd = null; +// if(StringUtils.isNotEmpty(id+"")) { +// if(StringUtils.isNotEmpty(sql)) { +// isSql = true; +// Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); +// loggerContext.setOldValues(oldValue); +// } else if(StringUtils.isNotEmpty(infoMethod)){ +// isMethod = true; +// currentClass = applicationContext.getBean(pjp.getTarget().getClass()); +// // 获取方法 +// infoMtd = ReflectionUtils.findMethod(pjp.getTarget().getClass(),infoMethod, idClass); +// +// // todo 为空的情况加异常提醒 +// // 反射执行方法 +// Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); +// if(res != null) { +// if(res instanceof List) { +// loggerContext.setOldValueList((List) res); +// } else { +// loggerContext.setOldValues(res); +// } +// +// } +// } +// } +// +// LoggerTemplate loggerTemplate = new LoggerTemplate(); +// loggerTemplate.setFunction(funtionName); +// loggerTemplate.setModule(moduleName); +// loggerTemplate.setAsyncClient(asyncClient); +// +// Object result = null; +// try { +// args[keyPosition] = id; +// result = pjp.proceed(args); +// } catch (Throwable throwable) { +// throwable.printStackTrace(); +// } +// if(isSql) { +// Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); +// loggerContext.setNewValues(oldValue); +// } else if(isMethod) { +// Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); +// if(res != null) { +// if(res instanceof List) { +// loggerContext.setNewValueList((List) res); +// } else { +// loggerContext.setNewValues(res); +// } +// } +// } +// if(isLocal) +// loggerTemplate.write(loggerContext); +// else +// loggerTemplate.write(loggerContext,false); +// return result; +// +// } +//} diff --git a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java index 2be2f35b6..be8abc439 100644 --- a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java +++ b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java @@ -2,19 +2,14 @@ package com.engine.salary.elog.annotation.handle; import com.engine.salary.elog.annotation.ElogField; import com.engine.salary.elog.annotation.ElogTable; +import com.engine.salary.elog.dto.DateTypeEnum; import com.engine.salary.elog.dto.TableColumnBean; import com.engine.salary.elog.util.ElogUtils; -import com.weaver.common.elog.dao.TableCheckerMapper; -import com.weaver.common.elog.dto.DateTypeEnum; import lombok.extern.slf4j.Slf4j; import org.reflections.Reflections; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.aop.support.AopUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import javax.annotation.Resource; import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -29,14 +24,10 @@ import java.util.stream.Collectors; public class ElogTableScanner { private Logger logger = LoggerFactory.getLogger(this.getClass()); - @Resource - private ApplicationContext applicationContext; +// private TableCheckerMapper tableCheckerMapper; - @Autowired - private TableCheckerMapper tableCheckerMapper; - - @Override - public void run(String... args) throws Exception { +// @Override + public void run() throws Exception { // todo 需要考虑集群下，控制一台机器来跑 scanElogTable(); @@ -45,9 +36,10 @@ public class ElogTableScanner { private void scanElogTable() { // todo 是否还需要扫描Elog（因为可能不需要本地存储） ELogDetailTable， - Map tableBeans = this.applicationContext.getBeansWithAnnotation(ElogTable.class); - Reflections reflections = new Reflections("com.example.controller"); - Set> restController = reflections.getTypesAnnotatedWith(RestController.class); +// Map tableBeans = this.applicationContext.getBeansWithAnnotation(ElogTable.class); + Reflections reflections = new Reflections("com.engine.salary.elog"); + Set> tableBeans = reflections.getTypesAnnotatedWith(ElogTable.class); + List baseColumns = new ArrayList<>(); @@ -67,18 +59,11 @@ public class ElogTableScanner { } - private Map> elogTableHandle(Map tableBeans, List baseColumns) { - - + private Map> elogTableHandle(Set> tableBeans, List baseColumns) { Map> tableMap = new HashMap<>(); - - - for (Map.Entry entry : tableBeans.entrySet()) {//遍历每个controller层 + for (Class aClass :tableBeans) {//遍历每个controller层 List list = new ArrayList<>(); - System.out.println(entry.getKey());//demo1Controller - Object value = entry.getValue(); - Class aClass = AopUtils.getTargetClass(value);//获取class ElogTable elogTable = aClass.getAnnotation(ElogTable.class); @@ -101,7 +86,6 @@ public class ElogTableScanner { list.add(tableColumnBean); } if(!ElogUtils.BASE_TABLE.equals(elogTable.module())) { - tableMap.put(ElogUtils.getTableName(elogTable.module(), elogTable.function()), list); } else { baseColumns.addAll(list); @@ -112,8 +96,8 @@ public class ElogTableScanner { } private void tableCheck(String tableName, List columns) { - - List oldColumns = tableCheckerMapper.getTableStructure(tableName); + List oldColumns = new ArrayList<>(); +// List oldColumns = tableCheckerMapper.getTableStructure(tableName); // 表不存在 if(oldColumns == null || oldColumns.size() == 0) { @@ -147,7 +131,7 @@ public class ElogTableScanner { sb.append(columns.stream().map( bean -> bean.toSql()).collect(Collectors.joining(","))); sb.append(")"); logger.info("创建sql:{}",sb.toString()); - tableCheckerMapper.createElogTable(sb.toString()); +// tableCheckerMapper.createElogTable(sb.toString()); } private void addColumn(String tableName, TableColumnBean tableColumnBean) { @@ -157,7 +141,7 @@ public class ElogTableScanner { .append(" column ") .append(tableColumnBean.toSql()); logger.info("新增字段sql:{}",sb.toString()); - tableCheckerMapper.createElogTable(sb.toString()); +// tableCheckerMapper.createElogTable(sb.toString()); } private void modifyColumn(String tableName, TableColumnBean tableColumnBean) { @@ -167,6 +151,6 @@ public class ElogTableScanner { .append(" column ") .append(tableColumnBean.toSql()); logger.info("修改字段sql:{}",sb.toString()); - tableCheckerMapper.createElogTable(sb.toString()); +// tableCheckerMapper.createElogTable(sb.toString()); } } diff --git a/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java b/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java index 4a5c44d7b..b1934e4d3 100644 --- a/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java +++ b/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java @@ -1,40 +1,38 @@ -package com.engine.salary.elog.annotation.handle; - -import com.weaver.common.elog.annotation.LoggerTarget; -import com.weaver.common.elog.util.LoggerTemplate; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -import java.util.Map; - - -/** - * @ClassName: LoggerTargetHandler - * @Description 从Spring扫描到的类中获取到LoggerTarget自定义注解类设置function属性 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ - -@Component -public class LoggerTargetHandler implements CommandLineRunner { - - @Autowired - ApplicationContext applicationContext; - - @Override - public void run(String... args) throws Exception { - Map loggtemplateMap = applicationContext.getBeansWithAnnotation(LoggerTarget.class); - - for(Object obj : loggtemplateMap.values()) { - if(obj instanceof LoggerTemplate) { - LoggerTarget loggerTarget = obj.getClass().getAnnotation(LoggerTarget.class); - ((LoggerTemplate) obj).setFunction(loggerTarget.function()); - ((LoggerTemplate) obj).setModule(StringUtils.isNotEmpty(loggerTarget.value()) ? loggerTarget.value() : loggerTarget.module()); - } - - } - } -} +//package com.engine.salary.elog.annotation.handle; +// +//import com.weaver.common.elog.annotation.LoggerTarget; +//import com.weaver.common.elog.util.LoggerTemplate; +//import org.apache.commons.lang3.StringUtils; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.CommandLineRunner; +//import org.springframework.context.ApplicationContext; +//import org.springframework.stereotype.Component; +// +//import java.util.Map; +// +// +///** +// * @ClassName: LoggerTargetHandler +// * @Description 从Spring扫描到的类中获取到LoggerTarget自定义注解类设置function属性 +// * @Author tanghj +// * @Date 2021/2/10 14:18 +// */ +// +//public class LoggerTargetHandler { +// +// ApplicationContext applicationContext; +// +// @Override +// public void run(String... args) throws Exception { +// Map loggtemplateMap = applicationContext.getBeansWithAnnotation(LoggerTarget.class); +// +// for(Object obj : loggtemplateMap.values()) { +// if(obj instanceof LoggerTemplate) { +// LoggerTarget loggerTarget = obj.getClass().getAnnotation(LoggerTarget.class); +// ((LoggerTemplate) obj).setFunction(loggerTarget.function()); +// ((LoggerTemplate) obj).setModule(StringUtils.isNotEmpty(loggerTarget.value()) ? loggerTarget.value() : loggerTarget.module()); +// } +// +// } +// } +//} diff --git a/src/com/engine/salary/elog/async/LoggerMessageListener.java b/src/com/engine/salary/elog/async/LoggerMessageListener.java new file mode 100644 index 000000000..45f2e1b90 --- /dev/null +++ b/src/com/engine/salary/elog/async/LoggerMessageListener.java @@ -0,0 +1,31 @@ +package com.engine.salary.elog.async; + +import com.alibaba.fastjson.JSON; +import com.engine.salary.elog.config.ELogTableChecker; +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.service.LocalElogService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @ClassName: LoggerMessageListener + * @Description 本地日志存储消息队列监听类 + * @Author tanghj + * @Date 2021/2/10 14:18 + */ +public class LoggerMessageListener { + + private final Log logger = LogFactory.getLog(getClass()); + + // @Autowired + LocalElogService localElogService = new LocalElogService(); + // @Autowired + private ELogTableChecker eLogTableChecker = new ELogTableChecker(); + + public String receive(LoggerContext messageBean) { + logger.info("日志SDK消费到消息" + JSON.toJSONString(messageBean)); + eLogTableChecker.check(messageBean); + localElogService.insertLocalElog(messageBean); + return ""; + } +} diff --git a/src/com/engine/salary/elog/config/ELogCache.java b/src/com/engine/salary/elog/config/ELogCache.java new file mode 100644 index 000000000..d5de0885a --- /dev/null +++ b/src/com/engine/salary/elog/config/ELogCache.java @@ -0,0 +1,25 @@ +package com.engine.salary.elog.config; + +import com.engine.salary.mapper.elog.TableCheckerMapper; +import com.engine.salary.util.db.MapperProxyFactory; + +import java.util.HashMap; +import java.util.Map; + +public class ELogCache { + + private Map tableCache = new HashMap<>(); + + private TableCheckerMapper getTableCheckerMapper() { + return MapperProxyFactory.getProxy(TableCheckerMapper.class); + } + + public Long getVersion(String mainTable) { + Long version = tableCache.get(mainTable); + if (version == null) { + version = getTableCheckerMapper().getVersion(mainTable); + tableCache.put(mainTable, version); + } + return version; + } +} diff --git a/src/com/engine/salary/elog/config/ELogTableChecker.java b/src/com/engine/salary/elog/config/ELogTableChecker.java new file mode 100644 index 000000000..0fee08932 --- /dev/null +++ b/src/com/engine/salary/elog/config/ELogTableChecker.java @@ -0,0 +1,44 @@ +package com.engine.salary.elog.config; + +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.mapper.elog.TableCheckerMapper; +import com.engine.salary.util.db.MapperProxyFactory; +import dm.jdbc.util.IdGenerator; + + +public class ELogTableChecker { + private static final long version = 0; + private ELogCache eLogCache = new ELogCache(); + + private TableCheckerMapper getTableCheckerMapper() { + return MapperProxyFactory.getProxy(TableCheckerMapper.class); + } + + public void check(LoggerContext loggerContext) { + String module = loggerContext.getModuleName(); + String function = loggerContext.getFunctionName(); + String mainTable = String.format("%s_%slogs", module, function); + Long v = eLogCache.getVersion(mainTable); + boolean noTable = v == null; + if (noTable) { + this.initTable(mainTable); + v = version; + } else { + this.checkVersion(mainTable, v); + } + + } + + private void checkVersion(String mainTable, Long v) { + if (v == version) { + return; + } + } + + + private void initTable(String mainTable) { + getTableCheckerMapper().recordVersion(IdGenerator.generate(), mainTable, version); + getTableCheckerMapper().createMainTable(mainTable); + getTableCheckerMapper().createDetailTable(mainTable + "_detail"); + } +} diff --git a/src/com/engine/salary/elog/service/ApplicationContextProvider.java b/src/com/engine/salary/elog/service/ApplicationContextProvider.java new file mode 100644 index 000000000..d1bc541d4 --- /dev/null +++ b/src/com/engine/salary/elog/service/ApplicationContextProvider.java @@ -0,0 +1,67 @@ +//package com.engine.salary.elog.service; +// +//import org.springframework.beans.BeansException; +//import org.springframework.context.ApplicationContext; +//import org.springframework.context.ApplicationContextAware; +//import org.springframework.stereotype.Component; +// +///** +// * 获取Spring上下文 +// * +// * @author tanghj +// * @date on 2020-10-19 +// */ +// +//public class ApplicationContextProvider implements ApplicationContextAware { +// /** +// * 上下文对象实例 +// */ +// private static ApplicationContext applicationContext; +// +// @Override +// public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { +// this.applicationContext = applicationContext; +// } +// +// /** +// * 获取applicationContext +// * +// * @return +// */ +// public static ApplicationContext getApplicationContext() { +// return applicationContext; +// } +// +// /** +// * 通过name获取 Bean. +// * +// * @param name +// * @return +// */ +// public static Object getBean(String name) { +// return getApplicationContext().getBean(name); +// } +// +// /** +// * 通过class获取Bean. +// * +// * @param clazz +// * @param +// * @return +// */ +// public static T getBean(Class clazz) { +// return getApplicationContext().getBean(clazz); +// } +// +// /** +// * 通过name,以及Clazz返回指定的Bean +// * +// * @param name +// * @param clazz +// * @param +// * @return +// */ +// public static T getBean(String name, Class clazz) { +// return getApplicationContext().getBean(name, clazz); +// } +//} diff --git a/src/com/engine/salary/elog/service/LocalElogService.java b/src/com/engine/salary/elog/service/LocalElogService.java new file mode 100644 index 000000000..a9a368533 --- /dev/null +++ b/src/com/engine/salary/elog/service/LocalElogService.java @@ -0,0 +1,74 @@ +package com.engine.salary.elog.service; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.dto.LoggerDetailContext; +import com.engine.salary.mapper.elog.LocalElogDaoMapper; +import com.engine.salary.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; + +import java.util.Set; +import java.util.UUID; + +/** + * @ClassName: LocalElogService + * @Description TODO + * @Author tanghj + * @Date 2021/2/24 11:03 + */ +public class LocalElogService { + + private LocalElogDaoMapper getLocalElogDaoMapper() { + return MapperProxyFactory.getProxy(LocalElogDaoMapper.class); + } + + public int insertLocalElog(LoggerContext context) { + if (StringUtils.isEmpty(context.getUuid())) { + context.setUuid(UUID.randomUUID().toString().replace("-", "")); + } + + String cusColumns = ""; + String cusValus = ""; + if (context.getCustomInfo() != null) { + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(context.getCustomInfo())); + + for (String key : (Set) custom.keySet()) { + cusColumns = cusColumns + ", " + key; + cusValus = cusValus + ",'" + custom.getString(key) + "'"; + } + + } + + String params = context.getParams() == null ? null : JSONObject.toJSONString(context.getParams()); + + String tableName = context.getModuleName() + "_" + context.getFunctionName() + "logs"; + + getLocalElogDaoMapper().insertElogContext(context, params, cusColumns, cusValus, tableName); + if (context.getDetailContexts() != null) { + String detailTableName = context.getModuleName() + "_" + context.getFunctionName() + "logs_detail"; + for (LoggerDetailContext detailContext : context.getDetailContexts()) { + insertElogDetail(detailContext, context.getUuid(), detailTableName); + } + + } + + return 1; + } + + private int insertElogDetail(LoggerDetailContext loggerDetailContext, String mainId, String detailTableName) { + String cusColumns = ""; + String cusValus = ""; + if (loggerDetailContext.getCustomDetailInfo() != null) { + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(loggerDetailContext.getCustomDetailInfo())); + + for (String key : (Set) custom.keySet()) { + cusColumns = cusColumns + ", " + key; + cusValus = cusValus + ",'" + custom.getString(key) + "'"; + } + } + getLocalElogDaoMapper().insertElogDetail(loggerDetailContext, mainId, cusColumns, cusValus, detailTableName); + return 1; + } + +} diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java index 1041e9375..6dc03b33c 100644 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -1,14 +1,12 @@ package com.engine.salary.elog.util; import com.alibaba.fastjson.JSONObject; -import com.weaver.common.async.bean.AsyncBean; -import com.weaver.common.async.producer.client.AsyncClient; -import com.weaver.common.elog.dto.LoggerContext; -import com.weaver.common.elog.dto.LoggerDetailContext; -import com.weaver.common.elog.dto.TableChangeBean; +import com.engine.salary.elog.async.LoggerMessageListener; +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.dto.LoggerDetailContext; +import com.engine.salary.elog.dto.TableChangeBean; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import org.springframework.beans.factory.annotation.Autowired; import java.lang.reflect.Field; import java.util.*; @@ -28,30 +26,25 @@ public class LoggerTemplate { protected String localQueue; - @Autowired - protected AsyncClient asyncClient; /** * 写入日志消息队列 + * * @param context 日志实体 */ - public void write(LoggerContext context){ + public void write(LoggerContext context) { this.write(context, true); } /** * 写入日志消息队列 + * * @param context 日志实体 * @param isLocal true 存储本地， false不存储本地 */ - public void write(LoggerContext context, boolean isLocal){ - AsyncBean asyncBean = new AsyncBean<>(); + public void write(LoggerContext context, boolean isLocal) { handleContext(context); - asyncBean.setMessage(context); - asyncBean.setQueue(logCenterQueue); - asyncClient.send(asyncBean); - if(isLocal) { - asyncBean.setQueue(localQueue); - asyncClient.send(asyncBean); + if (isLocal) { + new LoggerMessageListener().receive(context); } } @@ -63,66 +56,66 @@ public class LoggerTemplate { List valueChangeList = new ArrayList<>(); int showOrder = 0; - if(changeBeans != null) - for(TableChangeBean changeBean : changeBeans) { - if(changeBean != null && (changeBean.getNewValue() != null || changeBean.getOldValue() != null)) { - ApiModel apiModel = null; - JSONObject newJo = new JSONObject(); - JSONObject oldJo = new JSONObject(); - JSONObject valueChange = JSONObject.parseObject(JSONObject.toJSONString(changeBean)); - if(changeBean.getNewValue() != null) { - apiModel = changeBean.getNewValue().getClass().getAnnotation(ApiModel.class); - newJo = valueChange.getJSONObject("newValue"); - } else { - apiModel = changeBean.getOldValue().getClass().getAnnotation(ApiModel.class); - } - if(changeBean.getOldValue() != null) { - oldJo = valueChange.getJSONObject("oldValue"); - } - if(apiModel != null) { - Field[] fields = changeBean.getNewValue().getClass().getDeclaredFields(); - for(Field field : fields) { - ApiModelProperty apiModelProperty = field.getAnnotation(ApiModelProperty.class); - LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - valueChangeBean.setTableName(changeBean.getTableName()); - valueChangeBean.setFieldName(field.getName()); - valueChangeBean.setFieldDesc(apiModelProperty.value()); - valueChangeBean.setNewValue(newJo.getString(field.getName())); - valueChangeBean.setOldValue(oldJo.getString(field.getName())); - valueChangeBean.setShoworder(showOrder++); - valueChangeList.add(valueChangeBean); + if (changeBeans != null) + for (TableChangeBean changeBean : changeBeans) { + if (changeBean != null && (changeBean.getNewValue() != null || changeBean.getOldValue() != null)) { + ApiModel apiModel = null; + JSONObject newJo = new JSONObject(); + JSONObject oldJo = new JSONObject(); + JSONObject valueChange = JSONObject.parseObject(JSONObject.toJSONString(changeBean)); + if (changeBean.getNewValue() != null) { + apiModel = changeBean.getNewValue().getClass().getAnnotation(ApiModel.class); + newJo = valueChange.getJSONObject("newValue"); + } else { + apiModel = changeBean.getOldValue().getClass().getAnnotation(ApiModel.class); } - } else { - Set keys = new HashSet<>(); - for(String key : newJo.keySet()) { - keys.add(key); - LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - valueChangeBean.setTableName(changeBean.getTableName()); - valueChangeBean.setFieldName(key); - valueChangeBean.setFieldDesc(key); - valueChangeBean.setNewValue(newJo.getString(key)); - valueChangeBean.setOldValue(oldJo.getString(key)); - valueChangeBean.setShoworder(showOrder++); - valueChangeList.add(valueChangeBean); + if (changeBean.getOldValue() != null) { + oldJo = valueChange.getJSONObject("oldValue"); } - for(String key : oldJo.keySet()) { - if(keys.contains(key)) - continue; - keys.add(key); - LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - valueChangeBean.setTableName(changeBean.getTableName()); - valueChangeBean.setFieldName(key); - valueChangeBean.setFieldDesc(key); - valueChangeBean.setNewValue(newJo.getString(key)); - valueChangeBean.setOldValue(oldJo.getString(key)); - valueChangeBean.setShoworder(showOrder++); - valueChangeList.add(valueChangeBean); + if (apiModel != null) { + Field[] fields = changeBean.getNewValue().getClass().getDeclaredFields(); + for (Field field : fields) { + ApiModelProperty apiModelProperty = field.getAnnotation(ApiModelProperty.class); + LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setFieldName(field.getName()); + valueChangeBean.setFieldDesc(apiModelProperty.value()); + valueChangeBean.setNewValue(newJo.getString(field.getName())); + valueChangeBean.setOldValue(oldJo.getString(field.getName())); + valueChangeBean.setShoworder(showOrder++); + valueChangeList.add(valueChangeBean); + } + } else { + Set keys = new HashSet<>(); + for (String key : (Set) newJo.keySet()) { + keys.add(key); + LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setFieldName(key); + valueChangeBean.setFieldDesc(key); + valueChangeBean.setNewValue(newJo.getString(key)); + valueChangeBean.setOldValue(oldJo.getString(key)); + valueChangeBean.setShoworder(showOrder++); + valueChangeList.add(valueChangeBean); + } + for (String key : (Set)oldJo.keySet()) { + if (keys.contains(key)) + continue; + keys.add(key); + LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setFieldName(key); + valueChangeBean.setFieldDesc(key); + valueChangeBean.setNewValue(newJo.getString(key)); + valueChangeBean.setOldValue(oldJo.getString(key)); + valueChangeBean.setShoworder(showOrder++); + valueChangeList.add(valueChangeBean); + } } } } - } - if(valueChangeList.size() > 0) + if (valueChangeList.size() > 0) context.setDetailContexts(valueChangeList); } @@ -140,12 +133,13 @@ public class LoggerTemplate { /** * 获取日志实体类 + * * @return */ public LoggerContext getContext() { LoggerContext loggerContext = new LoggerContext(); - loggerContext.setUuid(UUID.randomUUID().toString().replace("-","")); + loggerContext.setUuid(UUID.randomUUID().toString().replace("-", "")); loggerContext.setModuleName(this.module); loggerContext.setFunctionName(this.function); @@ -157,8 +151,4 @@ public class LoggerTemplate { this.localQueue = module + "LocalQueue"; this.module = module; } - - public void setAsyncClient(AsyncClient asyncClient) { - this.asyncClient = asyncClient; - } } diff --git a/src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java b/src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java index 437d8376e..6ba9cb7bd 100644 --- a/src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java +++ b/src/com/engine/salary/formlua/entity/parameter/ExcelFuncs.java @@ -12,7 +12,7 @@ import java.util.LinkedList; import java.util.List; -@Component + public class ExcelFuncs { protected final Logger logger = LoggerFactory.getLogger(getClass()); final static private String ALLFORM="all"; diff --git a/src/com/engine/salary/formlua/entity/parameter/FuncDescUtil.java b/src/com/engine/salary/formlua/entity/parameter/FuncDescUtil.java index d4e5fcee3..666135c26 100644 --- a/src/com/engine/salary/formlua/entity/parameter/FuncDescUtil.java +++ b/src/com/engine/salary/formlua/entity/parameter/FuncDescUtil.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; -@Component + public class FuncDescUtil { protected final Logger logger = LoggerFactory.getLogger(FuncDescUtil.class); Map funcMap = new HashMap(); diff --git a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java new file mode 100644 index 000000000..56dddcd45 --- /dev/null +++ b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java @@ -0,0 +1,36 @@ +package com.engine.salary.mapper.elog; + +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.dto.LoggerDetailContext; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: LocalElogDao + * @Description 本地操作日志持久层 + * @Author tanghj + * @Date 2021/2/24 9:35 + */ +public interface LocalElogDaoMapper { + + int insertElogContext(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "params") String params, + @Param(value = "cusColumns") String cusColumns, + @Param(value = "cusValus") String cusValus, + @Param(value = "tableName") String tableName); + + List> queryElogList(@Param(value = "logContent") LoggerContext loggerContext, + @Param("limit") String limit, + @Param(value = "tableName") String tableName); + + Map elogCount(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "tableName") String tableName); + + int insertElogDetail(@Param(value = "detailContext") LoggerDetailContext loggerDetailContext, + @Param(value = "mainid") String mainid, + @Param(value = "cusColumns") String cusColumns, + @Param(value = "cusValus") String cusValus, + @Param(value = "detailTableName") String tableName); +} diff --git a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml new file mode 100644 index 000000000..7349e7026 --- /dev/null +++ b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml @@ -0,0 +1,41 @@ + + + + + + insert into ${tableName} (uuid, date, tenant_key, modulename, functionName, + operator, operatorname, targetid, targetname, interfacename, operatetype, operatedesc, + params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice, cancelcontext, device, groupid + ${cusColumns}) + values + (#{logContent.uuid}, #{logContent.date}, + #{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName}, #{logContent.operator}, #{logContent.operatorName}, #{logContent.targetId} + , #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType}, #{logContent.operatedesc}, + #{params}, #{logContent.clientIp}, #{logContent.groupNameLabel}, #{logContent.redoService}, + #{logContent.redoContext}, #{logContent.cancelService}, #{logContent.cancelContext}, #{logContent.device}, #{logContent.groupId} + ${cusValus}) + + + + + + + + insert into ${detailTableName} (mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder + ${cusColumns}) + values( + #{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder} + ${cusValus} + ) + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java b/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java new file mode 100644 index 000000000..0a8e14928 --- /dev/null +++ b/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java @@ -0,0 +1,8 @@ +package com.engine.salary.mapper.elog; + +import java.util.Map; + +public interface QueryCurretValusMapper { + + Map queryValues(String sql); +} diff --git a/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml b/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml new file mode 100644 index 000000000..c3d7a16d1 --- /dev/null +++ b/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/elog/TableCheckerMapper.java b/src/com/engine/salary/mapper/elog/TableCheckerMapper.java new file mode 100644 index 000000000..5270ed5fe --- /dev/null +++ b/src/com/engine/salary/mapper/elog/TableCheckerMapper.java @@ -0,0 +1,20 @@ +package com.engine.salary.mapper.elog; + +import com.engine.salary.elog.dto.TableColumnBean; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface TableCheckerMapper { + Long getVersion(@Param("mainTable") String mainTable); + + void recordVersion(@Param("id") long id, @Param("mainTable") String mainTable, @Param("version") long version); + + void createMainTable(@Param("mainTable") String mainTable); + + void createDetailTable(@Param("detailTable") String detailTable); + + List getTableStructure(@Param("tableName") String tableName); + + void createElogTable(@Param("createElogSql") String createElogSql); +} diff --git a/src/com/engine/salary/mapper/elog/TableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/TableCheckerMapper.xml new file mode 100644 index 000000000..a9e4436d3 --- /dev/null +++ b/src/com/engine/salary/mapper/elog/TableCheckerMapper.xml @@ -0,0 +1,79 @@ + + + + + insert into elog_version (id, maintable, version) + values (#{id}, #{mainTable}, #{version}); + + + + create table ${mainTable} + ( + id bigint comment 'ID', + create_time datetime, + update_time datetime, + creator bigint, + delete_type int, + tenant_key varchar(10), + uuid char(36), + date datetime, + operator varchar(50), + operatorName varchar(50), + targetId varchar(50), + targetName varchar(1000), + module varchar(100), + `function` varchar(100), + interfaceName varchar(100), + operateType varchar(50), + desc varchar(1000), + params longtext, + clientIp varchar(50), + device varchar(200), + groupNameLabel varchar(500), + redoService varchar(200), + redoContext longtext, + cancelService varchar(200), + cancelContext longtext + ) + + + create table ${detailTable} + ( + id bigint comment 'ID', + create_time datetime, + update_time datetime, + creator bigint, + delete_type int, + tenant_key varchar(10), + uuid varchar(36), + tableName varchar(200), + fieldName char(200), + newValue longtext, + oldValue longtext, + fieldDesc varchar(200), + showorder int default 0 + ) + + + + + + + ${createElogSql} + + \ No newline at end of file From 7e980db4b3d0171461c09e5f88a88156482f4ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 21 Dec 2023 20:25:00 +0800 Subject: [PATCH 022/169] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/config/SalaryElogConfig.java | 418 ++++++++++ .../salary/config/SalaryPermissionConfig.java | 194 +++++ .../salary/elog/annotation/ElogField.java | 4 +- .../salary/elog/annotation/ElogTransform.java | 28 + .../annotation/handle/ElogTableScanner.java | 4 +- .../elog/async/LoggerMessageListener.java | 21 +- .../engine/salary/elog/config/ELogCache.java | 6 +- .../salary/elog/config/ELogTableChecker.java | 6 +- .../{DateTypeEnum.java => DataTypeEnum.java} | 2 +- .../engine/salary/elog/dto/LoggerContext.java | 583 ++++++++++++-- .../salary/elog/dto/LoggerDetailContext.java | 230 +++++- .../salary/elog/dto/TableChangeBean.java | 102 ++- .../salary/elog/dto/TableColumnBean.java | 6 +- .../engine/salary/elog/enums/ElogConsts.java | 22 + .../salary/elog/enums/FromTerminalType.java | 48 ++ .../engine/salary/elog/enums/LinkType.java | 173 ++++ .../salary/elog/enums/OperateAuditType.java | 14 + .../service/ApplicationContextProvider.java | 67 -- .../elog/service/ILocalElogService.java | 13 + .../salary/elog/service/LocalElogService.java | 74 -- .../elog/service/impl/LocalElogService.java | 435 ++++++++++ .../elog/threadlocal/ElogThreadLocal.java | 75 ++ .../engine/salary/elog/util/ElogUtils.java | 755 +++++++++++++++++- .../salary/elog/util/LoggerTemplate.java | 511 +++++++++++- ...apper.java => ElogTableCheckerMapper.java} | 12 +- .../mapper/elog/ElogTableCheckerMapper.xml | 451 +++++++++++ .../mapper/elog/LocalElogAopDaoMapper.java | 45 ++ .../mapper/elog/LocalElogAopDaoMapper.xml | 150 ++++ .../salary/mapper/elog/TableCheckerMapper.xml | 79 -- .../service/impl/SalaryItemServiceImpl.java | 42 +- 30 files changed, 4220 insertions(+), 350 deletions(-) create mode 100644 src/com/engine/salary/config/SalaryElogConfig.java create mode 100644 src/com/engine/salary/config/SalaryPermissionConfig.java create mode 100644 src/com/engine/salary/elog/annotation/ElogTransform.java rename src/com/engine/salary/elog/dto/{DateTypeEnum.java => DataTypeEnum.java} (85%) create mode 100644 src/com/engine/salary/elog/enums/ElogConsts.java create mode 100644 src/com/engine/salary/elog/enums/FromTerminalType.java create mode 100644 src/com/engine/salary/elog/enums/LinkType.java create mode 100644 src/com/engine/salary/elog/enums/OperateAuditType.java delete mode 100644 src/com/engine/salary/elog/service/ApplicationContextProvider.java create mode 100644 src/com/engine/salary/elog/service/ILocalElogService.java delete mode 100644 src/com/engine/salary/elog/service/LocalElogService.java create mode 100644 src/com/engine/salary/elog/service/impl/LocalElogService.java create mode 100644 src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java rename src/com/engine/salary/mapper/elog/{TableCheckerMapper.java => ElogTableCheckerMapper.java} (60%) create mode 100644 src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml create mode 100644 src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java create mode 100644 src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml delete mode 100644 src/com/engine/salary/mapper/elog/TableCheckerMapper.xml diff --git a/src/com/engine/salary/config/SalaryElogConfig.java b/src/com/engine/salary/config/SalaryElogConfig.java new file mode 100644 index 000000000..006e75a94 --- /dev/null +++ b/src/com/engine/salary/config/SalaryElogConfig.java @@ -0,0 +1,418 @@ +package com.engine.salary.config; + +import com.engine.salary.elog.util.LoggerTemplate; +import com.engine.salary.elog.util.LoggerTemplateBuilder; + +/** + * @description: elog日志 + * @author: xiajun + * @modified By: xiajun + * @date: Created in 10/22/21 10:27 AM + * @version:v1.0 + */ +public class SalaryElogConfig { + +// /** +// * 个税税率表 +// * +// * @return +// */ +// @Bean("taxRateLoggerTemplate") +// public LoggerTemplate taxRateLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "taxrate"); +// } + + /** + * 薪资项目 + * + * @return + */ + public static LoggerTemplate salaryItemLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "adc"); + } + +// /** +// * 个税扣缴义务人 +// * +// * @return +// */ +// @Bean("taxAgentLoggerTemplate") +// public LoggerTemplate taxAgentLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "taxagent"); +// } +// +// @Bean("siCategoryLoggerTemplate") +// public LoggerTemplate siCategoryLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "siCategory"); +// } +// +// @Bean("siSchemeLoggerTemplate") +// public LoggerTemplate siSchemeLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "siScheme"); +// } +// +// @Bean("totalSchemeLoggerTemplate") +// public LoggerTemplate totalSchemeLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "totalScheme"); +// } +// +// /** +// * 累计情况 +// * +// * @return +// */ +// @Bean("addUpSituationLoggerTemplate") +// public LoggerTemplate addUpSituationLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "addupsituation"); +// } +// +// /** +// * 累计专项附加扣除 +// * +// * @return +// */ +// @Bean("addUpDeductionLoggerTemplate") +// public LoggerTemplate addUpDeductionLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "addupdeduction"); +// } +// +// /** +// * 其他免税扣除 +// * +// * @return +// */ +// @Bean("otherDeductionLoggerTemplate") +// public LoggerTemplate otherDeductionLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "otherdeduction"); +// } +// +// /** +// * 减税 +// * +// * @return +// */ +// @Bean("derateDeductionLoggerTemplate") +// public LoggerTemplate derateDeductionLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "deratededuction"); +// } +// +// /** +// * 税延养老保险 +// * +// * @return +// */ +// @Bean("endowmentInsuranceLoggerTemplate") +// public LoggerTemplate endowmentInsuranceLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "endowmentinsurance"); +// } +// +// /** +// * 税延养老保险 +// * +// * @return +// */ +// @Bean("freeIncomeLoggerTemplate") +// public LoggerTemplate freeIncomeLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "freeincome"); +// } +// +// /** +// * 捐赠免税 +// * +// * @return +// */ +// @Bean("grantDonationLoggerTemplate") +// public LoggerTemplate grantDonationLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "grantdonation"); +// } +// +// /** +// * 捐赠免税 +// * +// * @return +// */ +// @Bean("healthInsuranceLoggerTemplate") +// public LoggerTemplate healthInsuranceLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "healthinsurance"); +// } +// +// /** +// * 其他免税扣除 +// * +// * @return +// */ +// @Bean("otherDerateDeductionLoggerTemplate") +// public LoggerTemplate otherDerateDeductionLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "otherderatededuction"); +// } +// +// /** +// * 考勤引用 +// * +// * @return +// */ +// @Bean("attendQuoteLoggerTemplate") +// public LoggerTemplate attendQuoteLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "attendquote"); +// } +// +// /** +// * 考勤引用字段管理 +// * +// * @return +// */ +// @Bean("attendQuoteFieldLoggerTemplate") +// public LoggerTemplate attendQuoteFieldLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "attendfield"); +// } +// +// /** +// * 考勤引用字段设置 +// * +// * @return +// */ +// @Bean("attendQuoteFieldSettingLoggerTemplate") +// public LoggerTemplate attendQuoteFieldSettingLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "attendfieldset"); +// } +// +// /** +// * 薪资账套 +// * +// * @return +// */ +// @Bean("salarySobLoggerTemplate") +// public LoggerTemplate salarySobLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "salarysob"); +// } +// +// /** +// * 薪资核算 +// * +// * @return +// */ +// @Bean("salaryAcctRecordLoggerTemplate") +// public LoggerTemplate salaryAcctRecordLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "acctrecord"); +// } +// +// /** +// * 个税申报表 +// * +// * @return +// */ +// @Bean("taxDeclarationLoggerTemplate") +// public LoggerTemplate taxDeclarationLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "taxdecla"); +// } +// +// /** +// * 福利档案 +// * +// * @return +// */ +// @Bean("siArchivesLoggerTemplate") +// public LoggerTemplate siArchivesLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "siarchives"); +// } +// +// /** +// * 社保规则 +// */ +// @Bean("archiveRuleLoggerTemplate") +// public LoggerTemplate archiveRuleLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "archiverule"); +// } +// +// /** +// * 代缴机构 +// * +// * @return +// */ +// @Bean("paymentAgencyLoggerTemplate") +// public LoggerTemplate paymentAgencyLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "paymentagency"); +// } +// +// /** +// * 福利核算 +// * +// * @return +// */ +// @Bean("siAccountLoggerTemplate") +// public LoggerTemplate siAccountLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "siaccount"); +// } +// +// /** +// * 工资单模板 +// * +// * @return +// */ +// @Bean("salaryTemplateLoggerTemplate") +// public LoggerTemplate salaryTemplateLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "salarytemplate"); +// } +// +// /** +// * 工资单发放 +// * +// * @return +// */ +// @Bean("salarySendLoggerTemplate") +// public LoggerTemplate salarySendLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "salarysend"); +// } +// +// /** +// * 外部人员 +// * +// * @return +// */ +// @Bean("extEmployeeLoggerTemplate") +// public LoggerTemplate extEmployeeLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "extemployee"); +// } +// +// /** +// * 薪资档案 +// * +// * @return +// */ +// @Bean("salaryArchiveLoggerTemplate") +// public LoggerTemplate salaryArchiveLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "salaryarchive"); +// } +// +// /** +// * 薪资档案-字段 +// * +// * @return +// */ +// @Bean("salaryArchiveFieldLoggerTemplate") +// public LoggerTemplate salaryArchiveFieldLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "salarcfield"); +// } +// +// /** +// * 薪资档案-薪资项目调整 +// * +// * @return +// */ +// @Bean("salaryArchiveItemAdjustLoggerTemplate") +// public LoggerTemplate salaryArchiveItemAdjustLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "salarcitemadj"); +// } +// +// /** +// * 薪资档案-批量调薪 +// * +// * @return +// */ +// @Bean("salaryArchiveBatchAdjustLoggerTemplate") +// public LoggerTemplate salaryArchiveBatchAdjustLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "salarcbatadj"); +// } +// +// /** +// * 自定义业务数据设置 +// * +// * @return +// */ +// @Bean("customDataSetLoggerTemplate") +// public LoggerTemplate customDataSetLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "customdataset"); +// } +// +// /** +// * 自定义业务数据 +// * +// * @return +// */ +// @Bean("customDataLoggerTemplate") +// public LoggerTemplate customDataLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "customdata"); +// } +// +// +// /** +// * 人员报送 +// * +// * @return +// */ +// @Bean("employeeDeclareLoggerTemplate") +// public LoggerTemplate employeeDeclareLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "empdeclare"); +// } +// +// /** +// * 单位扣款账号 +// * +// * @return +// */ +// @Bean("withholdAccountLoggerTemplate") +// public LoggerTemplate withholdAccountLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "whaccount"); +// } +// +// /** +// * 银行报盘 +// * +// * @return +// */ +// @Bean("bankOfferLoggerTemplate") +// public LoggerTemplate bankOfferLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "bankoffer"); +// } +// +// /** +// * 银行报盘模板 +// * +// * @return +// */ +// @Bean("bankOfferTemplateLoggerTemplate") +// public LoggerTemplate bankOfferTemplateLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "botemplate"); +// } +// +// /** +// * 薪酬体系标准（岗薪制） +// * +// * @return +// */ +// @Bean("postSalaryLoggerTemplate") +// public LoggerTemplate postSalaryLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "postsalary"); +// } +// +// /** +// * 银行报盘模板 +// * +// * @return +// */ +// @Bean("taxFreeDetailLoggerTemplate") +// public LoggerTemplate taxFreeDetailLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "taxfreedetail"); +// } +// +// /** +// * 最优年终奖计税方案 +// * +// * @return +// */ +// @Bean("annualBonusPlanLoggerTemplate") +// public LoggerTemplate annualBonusPlanLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "annualplan"); +// } +// +// /** +// * 最优年终奖计税方案-累计情况 +// * 最优年终奖计税方案-优化方案详情 +// * +// * @return +// */ +// @Bean("annualBonusLoggerTemplate") +// public LoggerTemplate annualBonusLoggerTemplate() { +// return LoggerTemplateBuilder.build("hrsa", "annualbonus"); +// } +} diff --git a/src/com/engine/salary/config/SalaryPermissionConfig.java b/src/com/engine/salary/config/SalaryPermissionConfig.java new file mode 100644 index 000000000..7703e9267 --- /dev/null +++ b/src/com/engine/salary/config/SalaryPermissionConfig.java @@ -0,0 +1,194 @@ +//package com.engine.salary.config; +// +//import com.weaver.common.component.permission.container.FrontDataContainer; +//import com.weaver.common.mybatis.permission.config.PermissionConfig; +//import com.weaver.common.mybatis.permission.container.PermissionDataContainer; +//import com.weaver.common.mybatis.permission.model.PermissionModuleSourceBean; +//import com.weaver.common.mybatis.permission.model.PermissionModuleTargetBean; +//import com.weaver.common.mybatis.permission.service.PermissionModuleSourceService; +//import com.weaver.common.mybatis.permission.service.PermissionModuleTargetService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.annotation.Configuration; +// +//import javax.annotation.PostConstruct; +// +///** +// * @description: 数据权限配置 +// * @author: xiajun +// * @modified By: xiajun +// * @date: Created in 2023/6/7 10:28 +// * @version:v1.0 +// */ +//@Configuration +//public class SalaryPermissionConfig { +// +// @Autowired +// private PermissionConfig permissionConfig; +// @Autowired +// private PermissionModuleSourceService permissionModuleSourceService; +// @Autowired +// private PermissionModuleTargetService permissionModuleTargetService; +// +// public static final String TABLE_NAME = "hrsa"; +// public static final String PERMISSION_ID = "salary_standard_share"; +// +// /** +// * 初始化模块支持的权限类型 +// */ +// @PostConstruct +// public void init() { +// +// // 初始化权限字典数据 +// permissionConfig.initPermissionData(); +// +// // 给permissionId指定sourceType 类型 ，可以是多个 +// PermissionModuleSourceBean permissionModuleSourceBean = new PermissionModuleSourceBean(); +// permissionModuleSourceBean.setPermissionId(PERMISSION_ID); +// permissionModuleSourceBean.setSourceType(1); // 指定资源 +// permissionModuleSourceService.addBySql(permissionModuleSourceBean); +// +// // 给permissionId指定targetType 类型 ，可以是多个 +// PermissionModuleTargetBean resourceTarget = new PermissionModuleTargetBean(); +// resourceTarget.setPermissionId(PERMISSION_ID); +// resourceTarget.setTargetType(1); // 人力资源 +// permissionModuleTargetService.addBySql(resourceTarget); +// +// PermissionModuleTargetBean departmentTarget = new PermissionModuleTargetBean(); +// departmentTarget.setPermissionId(PERMISSION_ID); +// departmentTarget.setTargetType(2); // 部门+安全级别 +// permissionModuleTargetService.addBySql(departmentTarget); +// +// PermissionModuleTargetBean departmentTarget2 = new PermissionModuleTargetBean(); +// departmentTarget2.setPermissionId(PERMISSION_ID); +// departmentTarget2.setTargetType(2001); // 部门+包含兼职部门 +// permissionModuleTargetService.addBySql(departmentTarget2); +// +// PermissionModuleTargetBean departmentTarget3 = new PermissionModuleTargetBean(); +// departmentTarget3.setPermissionId(PERMISSION_ID); +// departmentTarget3.setTargetType(3); // 部门+所有下级部门+安全级别 +// permissionModuleTargetService.addBySql(departmentTarget3); +// +// PermissionModuleTargetBean departmentTarget4 = new PermissionModuleTargetBean(); +// departmentTarget4.setPermissionId(PERMISSION_ID); +// departmentTarget4.setTargetType(3001); // 部门+所有下级部门+包含兼职部门 +// permissionModuleTargetService.addBySql(departmentTarget4); +// +// PermissionModuleTargetBean departmentTarget5 = new PermissionModuleTargetBean(); +// departmentTarget5.setPermissionId(PERMISSION_ID); +// departmentTarget5.setTargetType(3002); // 部门+所有下级部门+包含兼职部门+安全级别 +// permissionModuleTargetService.addBySql(departmentTarget5); +// +// PermissionModuleTargetBean departmentTarget6 = new PermissionModuleTargetBean(); +// departmentTarget6.setPermissionId(PERMISSION_ID); +// departmentTarget6.setTargetType(2002); // 部门+包含兼职部门+安全级别 +// permissionModuleTargetService.addBySql(departmentTarget6); +// +// PermissionModuleTargetBean branchTarget = new PermissionModuleTargetBean(); +// branchTarget.setPermissionId(PERMISSION_ID); +// branchTarget.setTargetType(5); // 分部+安全级别 +// permissionModuleTargetService.addBySql(branchTarget); +// +// PermissionModuleTargetBean branchTarget501 = new PermissionModuleTargetBean(); +// branchTarget501.setPermissionId(PERMISSION_ID); +// branchTarget501.setTargetType(501); // 分部+安全级别 +// permissionModuleTargetService.addBySql(branchTarget501); +// +// PermissionModuleTargetBean branchTarget502 = new PermissionModuleTargetBean(); +// branchTarget502.setPermissionId(PERMISSION_ID); +// branchTarget502.setTargetType(502); // 分部+安全级别+兼职 +// permissionModuleTargetService.addBySql(branchTarget502); +// +// PermissionModuleTargetBean branchTarget2 = new PermissionModuleTargetBean(); +// branchTarget2.setPermissionId(PERMISSION_ID); +// branchTarget2.setTargetType(6); // 分部+所有下级分部+安全级别 +// permissionModuleTargetService.addBySql(branchTarget2); +// +// PermissionModuleTargetBean roleTarget = new PermissionModuleTargetBean(); +// roleTarget.setPermissionId(PERMISSION_ID); +// roleTarget.setTargetType(10); // 角色+角色级别+安全级别 +// permissionModuleTargetService.addBySql(roleTarget); +// +// PermissionModuleTargetBean allPeopleTarget = new PermissionModuleTargetBean(); +// allPeopleTarget.setPermissionId(PERMISSION_ID); +// allPeopleTarget.setTargetType(11); // 所有人+安全级别 +// permissionModuleTargetService.addBySql(allPeopleTarget); +// +// PermissionModuleTargetBean positionTarget = new PermissionModuleTargetBean(); +// positionTarget.setPermissionId(PERMISSION_ID); +// positionTarget.setTargetType(12); // 岗位+指定部门 +// permissionModuleTargetService.addBySql(positionTarget); +// +// PermissionModuleTargetBean positionTarget12001 = new PermissionModuleTargetBean(); +// positionTarget12001.setPermissionId(PERMISSION_ID); +// positionTarget12001.setTargetType(12001); // 岗位+指定部门+安全级别 +// permissionModuleTargetService.addBySql(positionTarget12001); +// +// PermissionModuleTargetBean positionTarget12111 = new PermissionModuleTargetBean(); +// positionTarget12111.setPermissionId(PERMISSION_ID); +// positionTarget12111.setTargetType(12111); // 岗位+指定部门+包含兼职岗位 +// permissionModuleTargetService.addBySql(positionTarget12111); +// +// PermissionModuleTargetBean positionTarget12112 = new PermissionModuleTargetBean(); +// positionTarget12112.setPermissionId(PERMISSION_ID); +// positionTarget12112.setTargetType(12112); // 岗位+指定部门+包含兼职岗位+安全级别 +// permissionModuleTargetService.addBySql(positionTarget12112); +// +// PermissionModuleTargetBean positionTarget1201 = new PermissionModuleTargetBean(); +// positionTarget1201.setPermissionId(PERMISSION_ID); +// positionTarget1201.setTargetType(1201); // 兼职岗位+安全级别 +// permissionModuleTargetService.addBySql(positionTarget1201); +// +// PermissionModuleTargetBean positionTarget2 = new PermissionModuleTargetBean(); +// positionTarget2.setPermissionId(PERMISSION_ID); +// positionTarget2.setTargetType(13); // 岗位+指定分部 +// permissionModuleTargetService.addBySql(positionTarget2); +// +// PermissionModuleTargetBean positionTarget13001 = new PermissionModuleTargetBean(); +// positionTarget13001.setPermissionId(PERMISSION_ID); +// positionTarget13001.setTargetType(13001); // 岗位+指定分部+安全级别 +// permissionModuleTargetService.addBySql(positionTarget13001); +// +// PermissionModuleTargetBean positionTarget13110 = new PermissionModuleTargetBean(); +// positionTarget13110.setPermissionId(PERMISSION_ID); +// positionTarget13110.setTargetType(13110); // 岗位+指定分部+包含兼职岗位 + 安全级别 +// permissionModuleTargetService.addBySql(positionTarget13110); +// +// PermissionModuleTargetBean positionTarget1311 = new PermissionModuleTargetBean(); +// positionTarget1311.setPermissionId(PERMISSION_ID); +// positionTarget1311.setTargetType(1311); // 岗位+总部 +// permissionModuleTargetService.addBySql(positionTarget1311); +// +// PermissionModuleTargetBean positionTarget1312 = new PermissionModuleTargetBean(); +// positionTarget1312.setPermissionId(PERMISSION_ID); +// positionTarget1312.setTargetType(1312); // 岗位+总部+安全级别 +// permissionModuleTargetService.addBySql(positionTarget1312); +// +// PermissionModuleTargetBean positionTarget13111 = new PermissionModuleTargetBean(); +// positionTarget13111.setPermissionId(PERMISSION_ID); +// positionTarget13111.setTargetType(13111); // 岗位+总部+包含兼职岗位 +// permissionModuleTargetService.addBySql(positionTarget13111); +// +// PermissionModuleTargetBean positionTarget13112 = new PermissionModuleTargetBean(); +// positionTarget13112.setPermissionId(PERMISSION_ID); +// positionTarget13112.setTargetType(13112); // 岗位+总部+包含兼职岗位+安全级别 +// permissionModuleTargetService.addBySql(positionTarget13112); +// +// PermissionModuleTargetBean groupTarget = new PermissionModuleTargetBean(); +// groupTarget.setPermissionId(PERMISSION_ID); +// groupTarget.setTargetType(14); // 群组+安全级别 +// permissionModuleTargetService.addBySql(groupTarget); +// +// PermissionModuleTargetBean groupTarget2 = new PermissionModuleTargetBean(); +// groupTarget2.setPermissionId(PERMISSION_ID); +// groupTarget2.setTargetType(1411); // 群组 +// permissionModuleTargetService.addBySql(groupTarget2); +// +// // 创建权限表 +// // 一般模块要创建固定的权限表，类似流程模块可以调用这个接口，其他环境一般没有建表权限，以脚本的形式提供 +// // databaseService.createPermissionTable(TABLE_NAME,PERMISSION_ID); +// +// // 初始化permissionId和权限表的关系 +// FrontDataContainer.permissionFrontDataMap.put(PERMISSION_ID, TABLE_NAME); +// PermissionDataContainer.permissionDataContainer.put(PERMISSION_ID, TABLE_NAME); +// } +//} diff --git a/src/com/engine/salary/elog/annotation/ElogField.java b/src/com/engine/salary/elog/annotation/ElogField.java index 3b5df99c2..557a14f3c 100644 --- a/src/com/engine/salary/elog/annotation/ElogField.java +++ b/src/com/engine/salary/elog/annotation/ElogField.java @@ -1,6 +1,6 @@ package com.engine.salary.elog.annotation; -import com.engine.salary.elog.dto.DateTypeEnum; +import com.engine.salary.elog.dto.DataTypeEnum; import java.lang.annotation.*; @@ -9,7 +9,7 @@ import java.lang.annotation.*; @Target({ElementType.FIELD}) public @interface ElogField { - DateTypeEnum dataType() default DateTypeEnum.VARCHAR; + DataTypeEnum dataType() default DataTypeEnum.VARCHAR; int length() default 50; diff --git a/src/com/engine/salary/elog/annotation/ElogTransform.java b/src/com/engine/salary/elog/annotation/ElogTransform.java new file mode 100644 index 000000000..b876b18b2 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/ElogTransform.java @@ -0,0 +1,28 @@ +package com.engine.salary.elog.annotation; + +import java.lang.annotation.*; + +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD, ElementType.TYPE}) +public @interface ElogTransform { + + String tablename() default ""; + + String name(); + + int labelId() default -1; + + String type() default ""; + + String valuesKVPairs() default ""; + + boolean ignore() default false; + + boolean analyticSubclass() default false; + + boolean analyticList() default false; + + Class analyticListClass() default void.class; + +} diff --git a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java index be8abc439..4e75cf8bb 100644 --- a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java +++ b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java @@ -2,7 +2,7 @@ package com.engine.salary.elog.annotation.handle; import com.engine.salary.elog.annotation.ElogField; import com.engine.salary.elog.annotation.ElogTable; -import com.engine.salary.elog.dto.DateTypeEnum; +import com.engine.salary.elog.dto.DataTypeEnum; import com.engine.salary.elog.dto.TableColumnBean; import com.engine.salary.elog.util.ElogUtils; import lombok.extern.slf4j.Slf4j; @@ -108,7 +108,7 @@ public class ElogTableScanner { columns.stream().forEach(tableColumnBean -> newcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean)); oldColumns.stream().forEach(tableColumnBean -> { - tableColumnBean.setDataType(ElogUtils.getEnumFromString(DateTypeEnum.class, tableColumnBean.getDataTypeStr())); + tableColumnBean.setDataType(ElogUtils.getEnumFromString(DataTypeEnum.class, tableColumnBean.getDataTypeStr())); tableColumnBean.setNullable("YES".equalsIgnoreCase(tableColumnBean.getIsNullableStr())); oldcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean); }); diff --git a/src/com/engine/salary/elog/async/LoggerMessageListener.java b/src/com/engine/salary/elog/async/LoggerMessageListener.java index 45f2e1b90..6687a0603 100644 --- a/src/com/engine/salary/elog/async/LoggerMessageListener.java +++ b/src/com/engine/salary/elog/async/LoggerMessageListener.java @@ -1,11 +1,10 @@ package com.engine.salary.elog.async; -import com.alibaba.fastjson.JSON; import com.engine.salary.elog.config.ELogTableChecker; import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.service.LocalElogService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.engine.salary.elog.service.impl.LocalElogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @ClassName: LoggerMessageListener @@ -15,17 +14,17 @@ import org.apache.commons.logging.LogFactory; */ public class LoggerMessageListener { - private final Log logger = LogFactory.getLog(getClass()); + private final Logger logger = LoggerFactory.getLogger(getClass()); - // @Autowired LocalElogService localElogService = new LocalElogService(); - // @Autowired - private ELogTableChecker eLogTableChecker = new ELogTableChecker(); - public String receive(LoggerContext messageBean) { - logger.info("日志SDK消费到消息" + JSON.toJSONString(messageBean)); - eLogTableChecker.check(messageBean); + public String receiveold(LoggerContext messageBean) { + + new ELogTableChecker().check(messageBean); localElogService.insertLocalElog(messageBean); + return ""; } + + } diff --git a/src/com/engine/salary/elog/config/ELogCache.java b/src/com/engine/salary/elog/config/ELogCache.java index d5de0885a..841bddf18 100644 --- a/src/com/engine/salary/elog/config/ELogCache.java +++ b/src/com/engine/salary/elog/config/ELogCache.java @@ -1,6 +1,6 @@ package com.engine.salary.elog.config; -import com.engine.salary.mapper.elog.TableCheckerMapper; +import com.engine.salary.mapper.elog.ElogTableCheckerMapper; import com.engine.salary.util.db.MapperProxyFactory; import java.util.HashMap; @@ -10,8 +10,8 @@ public class ELogCache { private Map tableCache = new HashMap<>(); - private TableCheckerMapper getTableCheckerMapper() { - return MapperProxyFactory.getProxy(TableCheckerMapper.class); + private ElogTableCheckerMapper getTableCheckerMapper() { + return MapperProxyFactory.getProxy(ElogTableCheckerMapper.class); } public Long getVersion(String mainTable) { diff --git a/src/com/engine/salary/elog/config/ELogTableChecker.java b/src/com/engine/salary/elog/config/ELogTableChecker.java index 0fee08932..acbb1dc89 100644 --- a/src/com/engine/salary/elog/config/ELogTableChecker.java +++ b/src/com/engine/salary/elog/config/ELogTableChecker.java @@ -1,7 +1,7 @@ package com.engine.salary.elog.config; import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.mapper.elog.TableCheckerMapper; +import com.engine.salary.mapper.elog.ElogTableCheckerMapper; import com.engine.salary.util.db.MapperProxyFactory; import dm.jdbc.util.IdGenerator; @@ -10,8 +10,8 @@ public class ELogTableChecker { private static final long version = 0; private ELogCache eLogCache = new ELogCache(); - private TableCheckerMapper getTableCheckerMapper() { - return MapperProxyFactory.getProxy(TableCheckerMapper.class); + private ElogTableCheckerMapper getTableCheckerMapper() { + return MapperProxyFactory.getProxy(ElogTableCheckerMapper.class); } public void check(LoggerContext loggerContext) { diff --git a/src/com/engine/salary/elog/dto/DateTypeEnum.java b/src/com/engine/salary/elog/dto/DataTypeEnum.java similarity index 85% rename from src/com/engine/salary/elog/dto/DateTypeEnum.java rename to src/com/engine/salary/elog/dto/DataTypeEnum.java index 9833cfa86..4b46cdd33 100644 --- a/src/com/engine/salary/elog/dto/DateTypeEnum.java +++ b/src/com/engine/salary/elog/dto/DataTypeEnum.java @@ -1,6 +1,6 @@ package com.engine.salary.elog.dto; -public enum DateTypeEnum { +public enum DataTypeEnum { VARCHAR, BIGINT, INT, diff --git a/src/com/engine/salary/elog/dto/LoggerContext.java b/src/com/engine/salary/elog/dto/LoggerContext.java index 248ce45d8..8c4b3aa0e 100644 --- a/src/com/engine/salary/elog/dto/LoggerContext.java +++ b/src/com/engine/salary/elog/dto/LoggerContext.java @@ -1,11 +1,14 @@ package com.engine.salary.elog.dto; +import com.alibaba.fastjson.annotation.JSONField; import com.engine.salary.elog.annotation.ElogField; import com.engine.salary.elog.annotation.ElogTable; -import com.engine.salary.elog.util.ElogUtils; +import com.engine.salary.elog.enums.ElogConsts; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.StringUtils; +import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -17,51 +20,55 @@ import java.util.Map; * @Author tanghj * @Date 2021/2/10 14:18 */ -@ElogTable(module = ElogUtils.BASE_TABLE) +@ElogTable(module = ElogConsts.BASE_TABLE) @ApiModel("日志实体类") -public class LoggerContext { - @ElogField(comment = "ID", dataType = DateTypeEnum.VARCHAR, isKey = true, isNull = false) +public class LoggerContext implements Serializable { + + private static final long serialVersionUID = 15869325700230992L; + + @ElogField(comment = "ID", dataType = DataTypeEnum.BIGINT, isKey = true) @ApiModelProperty("日志ID") private long id; - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 36,comment = "日志UUID") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36, comment = "日志UUID") @ApiModelProperty("日志UUID") - private String uuid; + private String uuid = ""; @ApiModelProperty("自定义日志字段信息") private T customInfo; - @ElogField(dataType = DateTypeEnum.DATETIME,comment = "操作时间") + @ElogField(dataType = DataTypeEnum.DATETIME, comment = "操作时间") @ApiModelProperty("操作时间") - private Date date; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date date = new Date(); - @ElogField(dataType = DateTypeEnum.VARCHAR,length = 50,comment = "终端信息") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 500, comment = "终端信息") @ApiModelProperty("终端信息") - private String device; + private String device = ""; - @ElogField(dataType = DateTypeEnum.VARCHAR,length = 50,comment = "操作人") + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "操作人") @ApiModelProperty("操作人") - private String operator; + private String operator = ""; - @ElogField(dataType = DateTypeEnum.VARCHAR,length = 100,comment = "操作人姓名") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "操作人姓名") @ApiModelProperty("操作人姓名") - private String operatorName; + private String operatorName = ""; - @ElogField(dataType = DateTypeEnum.VARCHAR,length = 10,comment = "租户id") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 10, comment = "租户id") @ApiModelProperty("租户id") - private String tenant_key; + private String tenant_key = ""; /** - * 要操作的对象在表中的主键值 + * 要操作的对象在表中的主键值 */ - @ElogField(dataType = DateTypeEnum.VARCHAR,length = 50,comment = "操作目标id") + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "操作目标id") @ApiModelProperty("操作目标id") - private String targetId; + private String targetId = ""; - @ElogField(dataType = DateTypeEnum.TEXT ,comment = "操作目标名称") + @ElogField(dataType = DataTypeEnum.TEXT, comment = "操作目标名称") @ApiModelProperty("操作目标名称（用于显示）") - private String targetName; + private String targetName = ""; - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 100,comment = "模块") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "模块") @ApiModelProperty("目标对象类型（大分类，模块，服务）") private String moduleName;// 模块 @@ -70,21 +77,29 @@ public class LoggerContext { * 数据存储是以模块名_子项目名作为最基本的存储单元 * 如果是子项目下的子项目 命名为：子项目名_子项目名_子项目名（全部小写） */ - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 100,comment = "服务（方法）") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "服务（方法）") @ApiModelProperty("目标对象类型（小分类，模块/服务下的子功能。子项目）") private String functionName; - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 100,comment = "访问接口名") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "访问接口名") @ApiModelProperty("访问接口名") - private String interfaceName; + private String interfaceName = ""; - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 50,comment = "操作类型") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "请求全路径") + @ApiModelProperty("请求全路径") + private String requestUrl = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "请求地址") + @ApiModelProperty("请求地址") + private String requestUri = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50, comment = "操作类型") @ApiModelProperty("操作类型（增删改查等）") - private String operateType; + private String operateType = ""; - @ElogField(dataType = DateTypeEnum.TEXT,comment = "操作类型") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "操作类型名称") @ApiModelProperty("操作类型名称") - private String operateTypeName; + private String operateTypeName = ""; /** * 每个TableChangeBean 为一张表，支持记录多张表的前后值 @@ -92,52 +107,202 @@ public class LoggerContext { @ApiModelProperty("修改前、后的值") private List changeValues;// 操作表名,[字段名,值] - @ElogField(dataType = DateTypeEnum.TEXT,comment = "操作类型") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 3000, comment = "操作详细说明") @ApiModelProperty("操作详细说明") - private String operatedesc; + private String operatedesc = ""; + @ElogField(dataType = DataTypeEnum.LONGTEXT, comment = "涉及的相关参数") @ApiModelProperty("涉及的相关参数") private Map params; - /*@ApiModelProperty("主日志") - private String mainId;//当作为主表，belongMainId不赋值 + @ApiModelProperty("涉及的相关参数-转string存储") + private String paramsStr; - @ApiModelProperty("从表日志") - private String belongMainId;*/ + /** + * 当作为主表，belongMainId不赋值 + */ + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36, comment = "所属主表uuid") + @ApiModelProperty("所属主表uuid") + private String belongMainId = ""; - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 50,comment = "操作IP") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50, comment = "操作IP") @ApiModelProperty("操作IP") - private String clientIp; + private String clientIp = ""; - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 50,comment = "分组") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50, comment = "分组") @ApiModelProperty("分组") - private String groupId; + private String groupId = ""; /*@ApiModelProperty("是否明显表") private boolean isDetail;*/ - @ElogField(dataType = DateTypeEnum.TEXT, comment = "分组标题") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 1000, comment = "分组标题") @ApiModelProperty("分组标题") - private int groupNameLabel; + private String groupNameLabel = ""; + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "重做业务接口") @ApiModelProperty("重做业务接口") - private String redoService; + private String redoService = ""; - @ElogField(dataType = DateTypeEnum.LONGTEXT, comment = "重做参数") + @ElogField(dataType = DataTypeEnum.LONGTEXT, comment = "重做参数") @ApiModelProperty("重做参数") private RedoContext redoContext; - @ElogField(dataType = DateTypeEnum.VARCHAR, length = 200, comment = "撤销业务接口") - @ApiModelProperty("撤销业务接口") - private String cancelService; + @ApiModelProperty("重做参数-转String存储") + private String redoContextStr; - @ElogField(dataType = DateTypeEnum.LONGTEXT, comment = "撤销参数") + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "撤销业务接口") + @ApiModelProperty("撤销业务接口") + private String cancelService = ""; + + @ElogField(dataType = DataTypeEnum.LONGTEXT, comment = "撤销参数") @ApiModelProperty("撤销参数") private CancelContext cancelContext; + @ApiModelProperty("撤销参数-转String存储") + private String cancelContextStr; + @ApiModelProperty("日志明细列表（值变化列表-自动赋值、或者自定义字段）") private List detailContexts; + @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "创建时间") + @ApiModelProperty("创建时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date create_time; + + @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "修改时间") + @ApiModelProperty("修改时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date update_time; + + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "创建人id") + @ApiModelProperty("创建人id") + private long creator; + + @ElogField(dataType = DataTypeEnum.INT, defaultValue = "0", comment = "是否删除") + @ApiModelProperty("是否删除") + private int delete_type; + + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "总运行时长") + @ApiModelProperty("总运行时长") + private long totalRunTime; + + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "主方法运行时长") + @ApiModelProperty("主方法运行时长") + private long mainRunTime; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, defaultValue = "", comment = "运行结果标识") + @ApiModelProperty("运行结果标识") + private String result = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, defaultValue = "", comment = "来自pc web") + @ApiModelProperty("来自终端") + private String fromTerminal = ""; + + @ElogField(dataType = DataTypeEnum.TEXT, comment = "运行结果描述") + @ApiModelProperty("运行结果描述") + private String resultDesc = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 3000, comment = "原先内容") + @ApiModelProperty("原先内容（et用）") + private String old_content = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 20, comment = "链接类型") + @ApiModelProperty("链接类型（et用）") + private String link_type = ""; + + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "链接id") + @ApiModelProperty("链接id（et用）") + private long link_id; + + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "原先链接id") + @ApiModelProperty("原先链接id（et用）") + private long old_link_id; + + /** + * 开发可以自由传中间临时参数，不会入库 + */ + @ApiModelProperty("临时参数") + private Object tempParams; + + /** + * 是否忽略该日志，不进行数据记录 + */ + @ApiModelProperty("是否忽略该日志，不进行数据记录") + private boolean logIgnore; + + /** + * 审计操作类型 + */ + @ApiModelProperty("审计操作类型") + protected String operateAuditType; + + /** + * 操作人账号 + */ + @ApiModelProperty("操作人账号") + protected String operateAccount; + + @ApiModelProperty("操作人id（兼容数据库用）") + protected long logOperator; + + @ApiModelProperty("操作人id（兼容数据库用）") + protected long logTargetid; + + @ApiModelProperty("ES存储大字段功能标识") + protected Boolean esFunction; + + @ApiModelProperty("params参数是否忽略记录") + private Boolean paramsIgnore = Boolean.FALSE; + + @ApiModelProperty("params请求体keys") + private List paramsBodyKeys; + + @ApiModelProperty("日志弱控记录") + private Boolean weakElogReocrd = Boolean.FALSE; + + private List clobFieldList; + + public List getClobFieldList() { + return clobFieldList; + } + + public void setClobFieldList(List clobFieldList) { + this.clobFieldList = clobFieldList; + } + + public Boolean getWeakElogReocrd() { + return weakElogReocrd; + } + + public void setWeakElogReocrd(Boolean weakElogReocrd) { + this.weakElogReocrd = weakElogReocrd; + } + + public Boolean getParamsIgnore() { + return paramsIgnore; + } + + public void setParamsIgnore(Boolean paramsIgnore) { + this.paramsIgnore = paramsIgnore; + } + + public List getParamsBodyKeys() { + return paramsBodyKeys; + } + + public void setParamsBodyKeys(List paramsBodyKeys) { + this.paramsBodyKeys = paramsBodyKeys; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + public String getUuid() { return uuid; } @@ -298,11 +463,11 @@ public class LoggerContext { isDetail = detail; }*/ - public int getGroupNameLabel() { + public String getGroupNameLabel() { return groupNameLabel; } - public void setGroupNameLabel(int groupNameLabel) { + public void setGroupNameLabel(String groupNameLabel) { this.groupNameLabel = groupNameLabel; } @@ -333,6 +498,7 @@ public class LoggerContext { public String getCancelService() { return cancelService; } + public void setCancelService(String cancelService) { this.cancelService = cancelService; } @@ -345,6 +511,24 @@ public class LoggerContext { this.detailContexts = detailContexts; } + public void addDetailContext(LoggerDetailContext loggerDetailContext) { + if (this.detailContexts != null) { + this.detailContexts.add(loggerDetailContext); + } else { + this.detailContexts = new ArrayList<>(); + this.detailContexts.add(loggerDetailContext); + } + } + + public void addDetailContext(List list) { + if (this.detailContexts != null) { + this.detailContexts.addAll(list); + } else { + this.detailContexts = new ArrayList<>(); + this.detailContexts.addAll(list); + } + } + public String getOperatorName() { return operatorName; } @@ -360,12 +544,12 @@ public class LoggerContext { } public void setOldValueList(List list) { - if(list != null) + if (list != null) list.stream().forEach(obj -> setOldValues(obj)); } public void setNewValueList(List list) { - if(list != null) + if (list != null) list.stream().forEach(obj -> setNewValues(obj)); } @@ -373,23 +557,97 @@ public class LoggerContext { List list = getChangeList(); boolean handled = false; - for(TableChangeBean bean : list) { - if(bean.getNewValue() == null) { + for (TableChangeBean bean : list) { + if (bean.getNewValue() == null) { bean.setNewValue(object); handled = true; break; } } - if(!handled) { + if (!handled) { TableChangeBean bean = new TableChangeBean(); - bean.setOldValue(object); + bean.setNewValue(object); + list.add(bean); + } + } + + public void setOldValues(Object object, String tableName, String dataId, String belongDataid) { + setOldValues(object, tableName, dataId, belongDataid, false); + } + + public void setOldValues(Object object, String tableName, String dataId, String belongDataid, boolean isDetail) { + TableChangeBean bean = new TableChangeBean(); + if (StringUtils.isNotEmpty(tableName)) + bean.setTableName(tableName); + if (StringUtils.isNotEmpty(dataId)) + bean.setDataid(dataId); + if (StringUtils.isNotEmpty(belongDataid)) + bean.setBelongDataid(belongDataid); + if (isDetail) + bean.setIsDetail(1); + bean.setOldValue(object); + getChangeList().add(bean); + } + + public void setOldValueList(List list, String tableName, String dataId, String belongDataid) { + setOldValueList(list, tableName, dataId, belongDataid, false); + } + + public void setNewValueList(List list, String tableName, String dataId, String belongDataid) { + setNewValueList(list, tableName, dataId, belongDataid, false); + } + + public void setOldValueList(List list, String tableName, String dataId, String belongDataid, boolean isDetail) { + if (list != null) + list.stream().forEach(obj -> setOldValues(obj, tableName, dataId, belongDataid, isDetail)); + } + + public void setNewValueList(List list, String tableName, String dataId, String belongDataid, boolean isDetail) { + if (list != null) + list.stream().forEach(obj -> setNewValues(obj, tableName, dataId, belongDataid, isDetail)); + } + + public void setNewValues(Object object, String tableName, String dataId, String belongDataid) { + setNewValues(object, tableName, dataId, belongDataid, false); + } + + public void setNewValues(Object object, String tableName, String dataId, String belongDataid, boolean isDetail) { + List list = getChangeList(); + + boolean handled = false; + for (TableChangeBean bean : list) { + if (bean.getNewValue() == null) { + bean.setNewValue(object); + if (StringUtils.isNotEmpty(tableName)) + bean.setTableName(tableName); + if (StringUtils.isNotEmpty(dataId)) + bean.setDataid(dataId); + if (StringUtils.isNotEmpty(belongDataid)) + bean.setBelongDataid(belongDataid); + if (isDetail) + bean.setIsDetail(1); + handled = true; + break; + } + } + if (!handled) { + TableChangeBean bean = new TableChangeBean(); + if (StringUtils.isNotEmpty(tableName)) + bean.setTableName(tableName); + if (StringUtils.isNotEmpty(dataId)) + bean.setDataid(dataId); + if (StringUtils.isNotEmpty(belongDataid)) + bean.setBelongDataid(belongDataid); + if (isDetail) + bean.setIsDetail(1); + bean.setNewValue(object); list.add(bean); } } public List getChangeList() { - if(this.changeValues == null) { + if (this.changeValues == null) { this.changeValues = new ArrayList<>(); } @@ -397,6 +655,10 @@ public class LoggerContext { } + public Object getParam(String id) { + return this.params.get(id); + } + public String getOperateTypeName() { return operateTypeName; } @@ -404,5 +666,214 @@ public class LoggerContext { public void setOperateTypeName(String operateTypeName) { this.operateTypeName = operateTypeName; } + + public String getParamsStr() { + return paramsStr; + } + + public void setParamsStr(String paramsStr) { + this.paramsStr = paramsStr; + } + + public String getRedoContextStr() { + return redoContextStr; + } + + public void setRedoContextStr(String redoContextStr) { + this.redoContextStr = redoContextStr; + } + + public String getCancelContextStr() { + return cancelContextStr; + } + + public void setCancelContextStr(String cancelContextStr) { + this.cancelContextStr = cancelContextStr; + } + + public String getBelongMainId() { + return belongMainId; + } + + public void setBelongMainId(String belongMainId) { + this.belongMainId = belongMainId; + } + + public String getRequestUrl() { + return requestUrl; + } + + public void setRequestUrl(String requestUrl) { + this.requestUrl = requestUrl; + } + + public String getRequestUri() { + return requestUri; + } + + public void setRequestUri(String requestUri) { + this.requestUri = requestUri; + } + + public Date getCreate_time() { + return create_time; + } + + public void setCreate_time(Date create_time) { + this.create_time = create_time; + } + + public Date getUpdate_time() { + return update_time; + } + + public void setUpdate_time(Date update_time) { + this.update_time = update_time; + } + + public long getCreator() { + return creator; + } + + public void setCreator(long creator) { + this.creator = creator; + } + + public int getDelete_type() { + return delete_type; + } + + public void setDelete_type(int delete_type) { + this.delete_type = delete_type; + } + + public long getTotalRunTime() { + return totalRunTime; + } + + public void setTotalRunTime(long totalRunTime) { + this.totalRunTime = totalRunTime; + } + + public long getMainRunTime() { + return mainRunTime; + } + + public void setMainRunTime(long mainRunTime) { + this.mainRunTime = mainRunTime; + } + + public Object getTempParams() { + return tempParams; + } + + public void setTempParams(Object tempParams) { + this.tempParams = tempParams; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getFromTerminal() { + return fromTerminal; + } + + public void setFromTerminal(String fromTerminal) { + this.fromTerminal = fromTerminal; + } + + public String getResultDesc() { + return resultDesc; + } + + public void setResultDesc(String resultDesc) { + this.resultDesc = resultDesc; + } + + public String getOld_content() { + return old_content; + } + + public void setOld_content(String old_content) { + this.old_content = old_content; + } + + public String getLink_type() { + return link_type; + } + + public void setLink_type(String link_type) { + this.link_type = link_type; + } + + public long getLink_id() { + return link_id; + } + + public void setLink_id(long link_id) { + this.link_id = link_id; + } + + public long getOld_link_id() { + return old_link_id; + } + + public void setOld_link_id(long old_link_id) { + this.old_link_id = old_link_id; + } + + public String getOperateAuditType() { + return operateAuditType; + } + + public void setOperateAuditType(String operateAuditType) { + this.operateAuditType = operateAuditType; + } + + public String getOperateAccount() { + return operateAccount; + } + + public void setOperateAccount(String operateAccount) { + this.operateAccount = operateAccount; + } + + public long getLogOperator() { + return logOperator; + } + + public void setLogOperator(long logOperator) { + this.logOperator = logOperator; + } + + public long getLogTargetid() { + return logTargetid; + } + + public void setLogTargetid(long logTargetid) { + this.logTargetid = logTargetid; + } + + public boolean getLogIgnore() { + return logIgnore; + } + + public void setLogIgnore(boolean logIgnore) { + this.logIgnore = logIgnore; + } + + public Boolean getEsFunction() { + return esFunction; + } + + public void setEsFunction(Boolean esFunction) { + this.esFunction = esFunction; + } + } diff --git a/src/com/engine/salary/elog/dto/LoggerDetailContext.java b/src/com/engine/salary/elog/dto/LoggerDetailContext.java index 8dd6ec7d9..7bb64e1ff 100644 --- a/src/com/engine/salary/elog/dto/LoggerDetailContext.java +++ b/src/com/engine/salary/elog/dto/LoggerDetailContext.java @@ -1,41 +1,148 @@ package com.engine.salary.elog.dto; +import com.engine.salary.elog.annotation.ElogDetailTable; +import com.engine.salary.elog.annotation.ElogField; +import com.engine.salary.elog.enums.ElogConsts; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; + /** * @ClassName: ValueChangeBean * @Description 值变化实体类（自动将表字段值变更类转换为该类） * @Author tanghj * @Date 2021/3/9 11:06 */ +@ElogDetailTable(module = ElogConsts.BASE_TABLE) @ApiModel("值变化实体类") -public class LoggerDetailContext { +public class LoggerDetailContext implements Serializable { + private static final long serialVersionUID = 15869325700230992L; + + @ElogField(comment = "ID", dataType = DataTypeEnum.BIGINT, isKey = true) + @ApiModelProperty("ID") + private long id; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36,comment = "日志UUID") @ApiModelProperty("同一个bean转换的数据，uuid相同，作为区分标识") - private String uuid; + private String uuid = ""; + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36,comment = "主表id") + @ApiModelProperty("主表id") + private String mainid = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50,comment = "数据id") + @ApiModelProperty("数据id") + private String dataid = ""; + + /** + * 当作为主表，belongDataId不赋值 + */ + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50,comment = "主表数据id") + @ApiModelProperty("主表数据id") + private String belongDataid = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200,comment = "表名") @ApiModelProperty("表名") - private String tableName; + private String tableName =""; + @ElogField(dataType = DataTypeEnum.VARCHAR, defaultValue = "-1", length = 50,comment = "表名labelid") + @ApiModelProperty("表名labelid") + private String tableNameLabelId = "-1"; + @ElogField(dataType = DataTypeEnum.VARCHAR, defaultValue="",isNull = false,length = 50,comment = "对应数据库的表") + @ApiModelProperty("对应数据库的表") + private String tableNameDesc = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200,comment = "字段名") @ApiModelProperty("字段名") - private String fieldName; + private String fieldName =""; + @ElogField(dataType = DataTypeEnum.VARCHAR, defaultValue = "-1", length = 50,comment = "字段名labelid") + @ApiModelProperty("字段名labelid") + private String fieldNameLabelId = "-1"; + + @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新后的值") @ApiModelProperty("更新后的值") - private String newValue; + private String newValue = ""; + @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新前的值") @ApiModelProperty("更新前的值") - private String oldValue; + private String oldValue = ""; + @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新后的显示值") + @ApiModelProperty("更新后的显示值") + private String newRealValue = ""; + + @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新前的显示值") + @ApiModelProperty("更新前的显示值") + private String oldRealValue = ""; + + @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "字段名") @ApiModelProperty("字段描述") - private String fieldDesc; + private String fieldDesc = ""; + @ElogField(dataType = DataTypeEnum.INT, comment = "字段名") @ApiModelProperty("字段展示顺序") - private int showorder; + private int showorder = 0; @ApiModelProperty("自定义字段") private T customDetailInfo; + @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "创建时间") + @ApiModelProperty("创建时间") + private Date create_time; + + @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "修改时间") + @ApiModelProperty("修改时间") + private Date update_time; + + @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "创建人id") + @ApiModelProperty("创建人id") + private long creator; + + @ElogField(dataType = DataTypeEnum.INT, defaultValue = "0" , comment = "是否删除") + @ApiModelProperty("是否删除") + private int delete_type; + + @ElogField(dataType = DataTypeEnum.VARCHAR,length = 10,comment = "租户id") + @ApiModelProperty("租户id") + private String tenant_key = ""; + + @ElogField(dataType = DataTypeEnum.INT, defaultValue = "0" , comment = "是否明细字段") + @ApiModelProperty("是否明细字段") + private int isDetail = 0; + + + private String cusValus; + + public String getCusValus() { + return cusValus; + } + + public void setCusValus(String cusValus) { + this.cusValus = cusValus; + } + + + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getMainid() { + return mainid; + } + + public void setMainid(String mainid) { + this.mainid = mainid; + } + public String getUuid() { return uuid; } @@ -99,4 +206,111 @@ public class LoggerDetailContext { public void setCustomDetailInfo(T customDetailInfo) { this.customDetailInfo = customDetailInfo; } + + public String getDataid() { + return dataid; + } + + public void setDataid(String dataid) { + this.dataid = dataid; + } + + public String getBelongDataid() { + return belongDataid; + } + + public void setBelongDataid(String belongDataid) { + this.belongDataid = belongDataid; + } + + public Date getCreate_time() { + return create_time; + } + + public void setCreate_time(Date create_time) { + this.create_time = create_time; + } + + public Date getUpdate_time() { + return update_time; + } + + public void setUpdate_time(Date update_time) { + this.update_time = update_time; + } + + public long getCreator() { + return creator; + } + + public void setCreator(long creator) { + this.creator = creator; + } + + public int getDelete_type() { + return delete_type; + } + + public void setDelete_type(int delete_type) { + this.delete_type = delete_type; + } + + public String getTenant_key() { + return tenant_key; + } + + public void setTenant_key(String tenant_key) { + this.tenant_key = tenant_key; + } + + public int getIsDetail() { + return isDetail; + } + + public void setIsDetail(int isDetail) { + this.isDetail = isDetail; + } + + public String getNewRealValue() { + return newRealValue; + } + + public void setNewRealValue(String newRealValue) { + this.newRealValue = newRealValue; + } + + public String getOldRealValue() { + return oldRealValue; + } + + public void setOldRealValue(String oldRealValue) { + this.oldRealValue = oldRealValue; + } + + public String getTableNameLabelId() { + return tableNameLabelId; + } + + public void setTableNameLabelId(String tableNameLabelId) { + this.tableNameLabelId = tableNameLabelId; + } + + public String getFieldNameLabelId() { + return fieldNameLabelId; + } + + public void setFieldNameLabelId(String fieldNameLabelId) { + this.fieldNameLabelId = fieldNameLabelId; + } + + public String getTableNameDesc() { + return tableNameDesc; + } + + public void setTableNameDesc(String tableNameDesc) { + this.tableNameDesc = tableNameDesc; + } + + + } diff --git a/src/com/engine/salary/elog/dto/TableChangeBean.java b/src/com/engine/salary/elog/dto/TableChangeBean.java index 86cfdb0c3..463d9dd73 100644 --- a/src/com/engine/salary/elog/dto/TableChangeBean.java +++ b/src/com/engine/salary/elog/dto/TableChangeBean.java @@ -3,6 +3,8 @@ package com.engine.salary.elog.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: TableChangeBean * @Description 表更新前后值类 @@ -10,11 +12,22 @@ import io.swagger.annotations.ApiModelProperty; * @Date 2021/3/8 15:58 */ @ApiModel("表更新前后值类") -public class TableChangeBean { +public class TableChangeBean implements Serializable { + + private static final long serialVersionUID = 15869325700230992L; @ApiModelProperty("表名") private String tableName; + @ApiModelProperty("数据id") + private String dataid; + + @ApiModelProperty("所属主表数据id") + private String belongDataid; + + @ApiModelProperty("是否为明细表（0,否；1，是）") + private int isDetail = 0; + /** * 泛型必须是具体的实体类 */ @@ -27,6 +40,29 @@ public class TableChangeBean { @ApiModelProperty("更新后的值") private T newValue; + /** + * 泛型必须是具体的实体类 + */ + @ApiModelProperty("更新前显示的值") + private T oldRealValue; + + /** + * 泛型必须是具体的实体类 + */ + @ApiModelProperty("更新后显示的值") + private T newRealValue; + + + @ApiModelProperty("字段对应的labelid") + private String fieldNameLabelId; + + @ApiModelProperty("表对应的labelid") + private String tableNameLabelId; + + @ApiModelProperty("对应数据库的表") + private String tableNameDesc; + + public String getTableName() { return tableName; } @@ -50,4 +86,68 @@ public class TableChangeBean { public void setNewValue(T newValue) { this.newValue = newValue; } + + public String getDataid() { + return dataid; + } + + public void setDataid(String dataid) { + this.dataid = dataid; + } + + public String getBelongDataid() { + return belongDataid; + } + + public void setBelongDataid(String belongDataid) { + this.belongDataid = belongDataid; + } + + public int getIsDetail() { + return isDetail; + } + + public void setIsDetail(int isDetail) { + this.isDetail = isDetail; + } + + public T getOldRealValue() { + return oldRealValue; + } + + public void setOldRealValue(T oldRealValue) { + this.oldRealValue = oldRealValue; + } + + public T getNewRealValue() { + return newRealValue; + } + + public String getFieldNameLabelId() { + return fieldNameLabelId; + } + + public void setFieldNameLabelId(String fieldNameLabelId) { + this.fieldNameLabelId = fieldNameLabelId; + } + + public String getTableNameLabelId() { + return tableNameLabelId; + } + + public void setTableNameLabelId(String tableNameLabelId) { + this.tableNameLabelId = tableNameLabelId; + } + + public String getTableNameDesc() { + return tableNameDesc; + } + + public void setTableNameDesc(String tableNameDesc) { + this.tableNameDesc = tableNameDesc; + } + + public void setNewRealValue(T newRealValue) { + this.newRealValue = newRealValue; + } } diff --git a/src/com/engine/salary/elog/dto/TableColumnBean.java b/src/com/engine/salary/elog/dto/TableColumnBean.java index e4c635cd0..cf8609c61 100644 --- a/src/com/engine/salary/elog/dto/TableColumnBean.java +++ b/src/com/engine/salary/elog/dto/TableColumnBean.java @@ -25,7 +25,7 @@ public class TableColumnBean { private String dataTypeStr; @ApiModelProperty("字段类型") - private DateTypeEnum dataType; + private DataTypeEnum dataType; @ApiModelProperty("长度") private long fieldLength; @@ -58,11 +58,11 @@ public class TableColumnBean { this.columnType = columnType; } - public DateTypeEnum getDataType() { + public DataTypeEnum getDataType() { return dataType; } - public void setDataType(DateTypeEnum dataType) { + public void setDataType(DataTypeEnum dataType) { this.dataType = dataType; } diff --git a/src/com/engine/salary/elog/enums/ElogConsts.java b/src/com/engine/salary/elog/enums/ElogConsts.java new file mode 100644 index 000000000..a895b95b8 --- /dev/null +++ b/src/com/engine/salary/elog/enums/ElogConsts.java @@ -0,0 +1,22 @@ +package com.engine.salary.elog.enums; + +/** + * @date: 2022/3/30 20:32 + * @author: deli.xu + * @description: 日志常量 + */ +public class ElogConsts { + + public static final String ORACLE = "oracle"; + public static final String SQLSERVER = "sqlserver"; + public static final String MYSQL = "mysql"; + public static final String POSTGRESQL = "postgresql"; + + public static final String BASE_TABLE = "BASE_ELOG_TABLE"; + + public static final String TABLE_SPACER = "_"; + public static final String TABLE_SUFFIX = "logs"; + public static final String DETAIL_TABLE_SUFFIX = "_detail"; + + public static final String ES = "ES"; +} diff --git a/src/com/engine/salary/elog/enums/FromTerminalType.java b/src/com/engine/salary/elog/enums/FromTerminalType.java new file mode 100644 index 000000000..d637bb0f9 --- /dev/null +++ b/src/com/engine/salary/elog/enums/FromTerminalType.java @@ -0,0 +1,48 @@ +package com.engine.salary.elog.enums; + +/** + * @ClassName: FromTerminalType + * @Description TODO + * @Author tanghj + * @Date 2021/6/8 11:35 + */ +public enum FromTerminalType { + PC("pc","来自 pc web"), + ANDROID("android","来自 安卓"), + IOS("ios","来自 iphone"), + IPHONE("iphone","来自 iphone"), + PC_CLIENT("pc_client","来自 windows客户端"), + MAC_CLIENT("mac_client","来自 mac客户端"), + H5("H5","来自 手机H5"), + MOBILEWEB("mobileWeb","来自 手机H5"), + MICO_MSG("mico_msg","来自 微信"), + WECHAT("wechat","来自 企业微信"), + APP_H5("app_h5","来自 app_h5"), + BROWSER("browser", "来自 网页"), + MOBILE("mobile","来自 移动端"); + + private String code; + private String face; + + FromTerminalType(String code, String face) { + this.code = code; + this.face = face; + } + + public String getCode() { + return code; + } + + public String getFace() { + return face; + } + + public static FromTerminalType fromString(String name) { + try { + FromTerminalType type = FromTerminalType.valueOf(name); + return type; + } catch (Exception e) { + return null; + } + } +} diff --git a/src/com/engine/salary/elog/enums/LinkType.java b/src/com/engine/salary/elog/enums/LinkType.java new file mode 100644 index 000000000..ff78362f0 --- /dev/null +++ b/src/com/engine/salary/elog/enums/LinkType.java @@ -0,0 +1,173 @@ +package com.engine.salary.elog.enums; + +/** + * @date: 2022/5/13 21:13 + * @author: deli.xu + * @description: 链接类型 用之前老eteams-base-bean + */ + +/** + * 链接类型 + * + * @author gk + */ +public enum LinkType { + + // 主线 + mainline("项目"), + + blog("工作日报"), + + workreport("计划报告"), + + clue("线索"), + + crmcontact("联系人-用于全局搜索"), + + marketactivity("活动"), + + crmSummary("报表"), + + statisticalReport("统计报表"), + + attend("出勤"), + + singalForm("表单应用"), + + biaoge("表格"), + + // 标签 + tag("标签"), + + // 表单标签 + formtag("表单标签"), + + // 附件 + attachment("附件"), + + // 用户 + user("用户"), + + // 任务 + task("任务"), + + // 子任务 + subtask("子任务"), + + // 文档 + document("文档"), + + // 文件夹 + folder("文件夹"), + + // 客户 + customer("客户"), + + // 联系人 + contact("联系人"), + + // 销售商机 + saleChance("销售商机"), + + // 产品 + production("产品"), + + // 合同 + contract("合同"), + + // 竞争对手 + competitor("竞争对手"), + + // 公告 + placard("公告"), + + // 审批 + workflow("审批"), + + // 部门 + department("部门"), + + // 岗位 + position("岗位"), + + // 日程 + calendar("日程"), + + // 群组 + group("群组"), + + // 合同 + hrcontract("人事合同"), + + //人事管理 + hr("人事"), + + //KPI + kpi("绩效考核"),kpiFlow("绩效考核流程"), + + // 全部 + all("所有人"), + + formdatareport("数据上报"), + + form("表单"), + + userSetting("不可见成员"), + + sms("短信"), + + wechatEnterprise("企业微信"), + + wechatService("微信服务号"), + + salarybill("工资单"), + + staffPosition("员工位置")/*定制化模块*/, + + app("应用")/*自定义应用*/, + + email("邮件"), + + workTrends("工作动态"), + + tenantLogo("个性化定制"), + + module("模块"), + + orderform("订单"), + + price("价格"), + + capital("资金"), + + quote("报价"), + + room("会议室管理"), + + //模板任务 + mtTask("模板任务"), + + watchMe("关注我的"), + // crm + crm("CRM"), + + // 空 + blank(""), + + role("角色"), + + externalUser("外部联系人"), + + subcompany("分部"); + + private String displayName; + + LinkType(String displayName) { + this.displayName = displayName; + } + + public String getDisplayName() { + return displayName; + } + +} diff --git a/src/com/engine/salary/elog/enums/OperateAuditType.java b/src/com/engine/salary/elog/enums/OperateAuditType.java new file mode 100644 index 000000000..5d3850c38 --- /dev/null +++ b/src/com/engine/salary/elog/enums/OperateAuditType.java @@ -0,0 +1,14 @@ +package com.engine.salary.elog.enums; + +public class OperateAuditType { + //自动 + public static final String AUTO = "AUTO"; + //信息 + public static final String INFO = "INFO"; + //错误 + public static final String ERROR = "ERROR"; + //警告 + public static final String WARNING = "WARNING"; + //重大事件 + public static final String EVENT = "EVENT"; +} \ No newline at end of file diff --git a/src/com/engine/salary/elog/service/ApplicationContextProvider.java b/src/com/engine/salary/elog/service/ApplicationContextProvider.java deleted file mode 100644 index d1bc541d4..000000000 --- a/src/com/engine/salary/elog/service/ApplicationContextProvider.java +++ /dev/null @@ -1,67 +0,0 @@ -//package com.engine.salary.elog.service; -// -//import org.springframework.beans.BeansException; -//import org.springframework.context.ApplicationContext; -//import org.springframework.context.ApplicationContextAware; -//import org.springframework.stereotype.Component; -// -///** -// * 获取Spring上下文 -// * -// * @author tanghj -// * @date on 2020-10-19 -// */ -// -//public class ApplicationContextProvider implements ApplicationContextAware { -// /** -// * 上下文对象实例 -// */ -// private static ApplicationContext applicationContext; -// -// @Override -// public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { -// this.applicationContext = applicationContext; -// } -// -// /** -// * 获取applicationContext -// * -// * @return -// */ -// public static ApplicationContext getApplicationContext() { -// return applicationContext; -// } -// -// /** -// * 通过name获取 Bean. -// * -// * @param name -// * @return -// */ -// public static Object getBean(String name) { -// return getApplicationContext().getBean(name); -// } -// -// /** -// * 通过class获取Bean. -// * -// * @param clazz -// * @param -// * @return -// */ -// public static T getBean(Class clazz) { -// return getApplicationContext().getBean(clazz); -// } -// -// /** -// * 通过name,以及Clazz返回指定的Bean -// * -// * @param name -// * @param clazz -// * @param -// * @return -// */ -// public static T getBean(String name, Class clazz) { -// return getApplicationContext().getBean(name, clazz); -// } -//} diff --git a/src/com/engine/salary/elog/service/ILocalElogService.java b/src/com/engine/salary/elog/service/ILocalElogService.java new file mode 100644 index 000000000..9d721b69c --- /dev/null +++ b/src/com/engine/salary/elog/service/ILocalElogService.java @@ -0,0 +1,13 @@ +package com.engine.salary.elog.service; + +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.dto.LoggerDetailContext; + +public interface ILocalElogService { + + int insertLocalElog(LoggerContext context); + + int insertElogDetail(LoggerDetailContext loggerDetailContext, String mainId, String detailTableName); + +// void rollBackElog(LoggerContext context); +} diff --git a/src/com/engine/salary/elog/service/LocalElogService.java b/src/com/engine/salary/elog/service/LocalElogService.java deleted file mode 100644 index a9a368533..000000000 --- a/src/com/engine/salary/elog/service/LocalElogService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.engine.salary.elog.service; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.dto.LoggerDetailContext; -import com.engine.salary.mapper.elog.LocalElogDaoMapper; -import com.engine.salary.util.db.MapperProxyFactory; -import org.apache.commons.lang3.StringUtils; - -import java.util.Set; -import java.util.UUID; - -/** - * @ClassName: LocalElogService - * @Description TODO - * @Author tanghj - * @Date 2021/2/24 11:03 - */ -public class LocalElogService { - - private LocalElogDaoMapper getLocalElogDaoMapper() { - return MapperProxyFactory.getProxy(LocalElogDaoMapper.class); - } - - public int insertLocalElog(LoggerContext context) { - if (StringUtils.isEmpty(context.getUuid())) { - context.setUuid(UUID.randomUUID().toString().replace("-", "")); - } - - String cusColumns = ""; - String cusValus = ""; - if (context.getCustomInfo() != null) { - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(context.getCustomInfo())); - - for (String key : (Set) custom.keySet()) { - cusColumns = cusColumns + ", " + key; - cusValus = cusValus + ",'" + custom.getString(key) + "'"; - } - - } - - String params = context.getParams() == null ? null : JSONObject.toJSONString(context.getParams()); - - String tableName = context.getModuleName() + "_" + context.getFunctionName() + "logs"; - - getLocalElogDaoMapper().insertElogContext(context, params, cusColumns, cusValus, tableName); - if (context.getDetailContexts() != null) { - String detailTableName = context.getModuleName() + "_" + context.getFunctionName() + "logs_detail"; - for (LoggerDetailContext detailContext : context.getDetailContexts()) { - insertElogDetail(detailContext, context.getUuid(), detailTableName); - } - - } - - return 1; - } - - private int insertElogDetail(LoggerDetailContext loggerDetailContext, String mainId, String detailTableName) { - String cusColumns = ""; - String cusValus = ""; - if (loggerDetailContext.getCustomDetailInfo() != null) { - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(loggerDetailContext.getCustomDetailInfo())); - - for (String key : (Set) custom.keySet()) { - cusColumns = cusColumns + ", " + key; - cusValus = cusValus + ",'" + custom.getString(key) + "'"; - } - } - getLocalElogDaoMapper().insertElogDetail(loggerDetailContext, mainId, cusColumns, cusValus, detailTableName); - return 1; - } - -} diff --git a/src/com/engine/salary/elog/service/impl/LocalElogService.java b/src/com/engine/salary/elog/service/impl/LocalElogService.java new file mode 100644 index 000000000..d12163a29 --- /dev/null +++ b/src/com/engine/salary/elog/service/impl/LocalElogService.java @@ -0,0 +1,435 @@ +package com.engine.salary.elog.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.dto.LoggerDetailContext; +import com.engine.salary.elog.enums.ElogConsts; +import com.engine.salary.elog.service.ILocalElogService; +import com.engine.salary.elog.util.ElogUtils; +import com.engine.salary.mapper.elog.LocalElogAopDaoMapper; +import com.engine.salary.util.db.MapperProxyFactory; +import dm.jdbc.util.IdGenerator; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.CollectionUtils; +import weaver.conn.RecordSet; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; + +/** + * @ClassName: LocalElogService + * @Description 日志本地持久化 + * @Author tanghj + * @Date 2021/2/24 11:03 + */ +public class LocalElogService implements ILocalElogService { + + private static final Logger logger = LoggerFactory.getLogger(LocalElogService.class); + + private LocalElogAopDaoMapper getLocalElogAopDaoMapper() { + return MapperProxyFactory.getProxy(LocalElogAopDaoMapper.class); + } + +// private RestHighLevelClient client; +// +// private LazyRollBack lazyRollBack; + + //数据库类型 + private static final String databaseId = new RecordSet().getDBType(); + + /** + * @param context + * @param + * @return + */ + @Override + public int insertLocalElog(LoggerContext context) { +// logger.error("接收到的数据，context:{}",JSONObject.toJSONString(context)); +// logger.info("接收到数据的时间：log_date:{}",context.getDate()); + if (StringUtils.isEmpty(context.getUuid())) { + context.setUuid(UUID.randomUUID().toString().replace("-", "")); + } + + String cusColumns = ""; + String cusValus = ""; + if (context.getCustomInfo() != null) { + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(context.getCustomInfo())); + List clobFieldList = context.getClobFieldList(); + for (String key : (Set) custom.keySet()) { + cusColumns = cusColumns + ", " + key; + String keystr = custom.getString(key); + //如果keystr包含单引号，将单引号去掉 + if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { + keystr = keystr.replace("'", "''"); + } + //如果是Oracle数据库 + if (ElogConsts.ORACLE.equals(databaseId)) { + //clob字段集合不为空且包含此字段 + if (!CollectionUtils.isEmpty(clobFieldList) && clobFieldList.contains(key)) { + String clobColumnStr = ElogUtils.handleClobColumn(keystr); + cusValus = cusValus + ",TO_CLOB( " + clobColumnStr + " )"; + } else if (checkStrIsDate(keystr)) { + //并且字符串为时间类型格式 则进行特殊处理 + cusValus = cusValus + ",TO_DATE('" + keystr + "', 'SYYYY-MM-DD HH24:MI:SS')"; + } else { + cusValus = cusValus + ",'" + keystr + "'"; + } + } else { + cusValus = cusValus + ",'" + keystr + "'"; + } + } + + } + + normalizationContext(context); + + String tableName = context.getModuleName() + "_" + context.getFunctionName() + "logs"; + //context.setId(IdGenerator.generate()); + Integer id = getLocalElogAopDaoMapper().queryElogContextById(context.getId(), tableName); + if (id != null) { + return 1; + } +// logger.info("插入前的数据：context:{}",JSONObject.toJSONString(context)); + int count = getLocalElogAopDaoMapper().insertElogContext(context, cusColumns, cusValus, tableName); + if (context.getDetailContexts() != null) { + String detailTableName = context.getModuleName() + "_" + context.getFunctionName() + "logs_detail"; + insertBatchDetailPrepared(detailTableName, context); + + } + return count; + } + + /** + * 预编译 + * + * @param detailTableName + * @param context + */ + private void insertBatchDetailPrepared(String detailTableName, LoggerContext context) { + // 用mapper + //分两种 有无自定义字段 + List detailContexts = context.getDetailContexts(); + Boolean hasCustonInfo = false; + String cusColumns = ""; + if (Objects.nonNull(detailContexts.get(0).getCustomDetailInfo())) { + hasCustonInfo = true; + //有自定义明细字段 + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContexts.get(0).getCustomDetailInfo())); + for (String key : (Set) custom.keySet()) { + cusColumns = cusColumns + ", " + key; + } + + } + for (LoggerDetailContext detailContext : detailContexts) { + if (StringUtils.isNotEmpty(detailContext.getNewValue())) { + String str = detailContext.getNewValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); + detailContext.setNewValue(str); + } + if (StringUtils.isNotEmpty(detailContext.getOldValue())) { + String str = detailContext.getOldValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); + detailContext.setOldValue(str); + } + if (StringUtils.isNotEmpty(detailContext.getNewRealValue())) { + String str = detailContext.getNewRealValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); + detailContext.setNewRealValue(str); + } + if (StringUtils.isNotEmpty(detailContext.getOldRealValue())) { + String str = detailContext.getOldRealValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); + detailContext.setOldRealValue(str); + } + + + detailContext.setTenant_key(context.getTenant_key()); + detailContext.setCreate_time(new Date()); + detailContext.setUpdate_time(new Date()); + detailContext.setCreator(context.getLogOperator()); + detailContext.setId(IdGenerator.generate()); + if (hasCustonInfo) { + String cusValus = ""; + //如果有明细 + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContext.getCustomDetailInfo())); + for (String key : (Set) custom.keySet()) { + String keystr = custom.getString(key); + //如果keystr包含单引号，将单引号去掉 + if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { + keystr = keystr.replace("'", "''"); + } + cusValus = cusValus + ",'" + keystr + "'"; + } + detailContext.setCusValus(cusValus); + } + } + + + if (hasCustonInfo) { + getLocalElogAopDaoMapper().insertElogDetailPreparedHasCustonInfo(detailTableName, detailContexts, context.getUuid(), cusColumns); + } else { + getLocalElogAopDaoMapper().insertElogDetailPrepared(detailTableName, detailContexts, context.getUuid()); + } + } + + + private void normalizationContext(LoggerContext context) { + String params = ""; + if (StringUtils.isNotEmpty(context.getParamsStr())) { + params = context.getParamsStr(); + } else if (context.getParams() != null) { + params = ElogUtils.compress(JSONObject.toJSONString(context.getParams())); + } + + context.setParamsStr(params); + if (StringUtils.isBlank(context.getCancelContextStr())) { + context.setCancelContextStr(context.getCancelContext() == null ? "" : JSONObject.toJSONString(context.getCancelContext())); + } + if (StringUtils.isBlank(context.getRedoContextStr())) { + context.setRedoContextStr(context.getRedoContext() == null ? "" : JSONObject.toJSONString(context.getRedoContext())); + } + + if (StringUtils.isEmpty(context.getOperatedesc())) { + context.setOperatedesc(""); + } else { + //todo 兼容emojo特殊字符 没有时间 先暴力替换 + String str = context.getOperatedesc().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); + context.setOperatedesc(str); + } + + if (Objects.isNull(context.getDate())) { + context.setDate(new Date()); + } + + if (StringUtils.isEmpty(context.getOperator())) { + context.setLogOperator(-1l); + } else { + context.setLogOperator(Long.parseLong(context.getOperator())); + } + if (StringUtils.isEmpty(context.getTargetId())) { + context.setLogTargetid(-1l); + } else { + context.setLogTargetid(Long.parseLong(context.getTargetId())); + } + if (StringUtils.isEmpty(context.getClientIp())) { + context.setClientIp("127.0.0.1"); + } + if (Objects.isNull(context.getCreate_time())) { + context.setCreate_time(new Date()); + } + if (Objects.isNull(context.getUpdate_time())) { + context.setUpdate_time(new Date()); + } + if (Objects.isNull(context.getDelete_type())) { + context.setDelete_type(0); + } + } + + private void insertBatchDetailSql(String detailTableName, LoggerContext context) { + String standardField = "id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, oldRealValue,tableNameDesc, tableNameLabelId,fieldNameLabelId, create_time, update_time"; + + Boolean hasCustonInfo = false; + StringBuilder sb = new StringBuilder(); + sb.append("INSERT INTO ").append(detailTableName).append("(").append(standardField); + //List collect = detailContexts.stream().filter(s -> Objects.nonNull(s.getCustomDetailInfo())).collect(Collectors.toList()); + List detailContexts = context.getDetailContexts(); + if (Objects.nonNull(detailContexts.get(0).getCustomDetailInfo())) { + hasCustonInfo = true; + //有自定义明细字段 + String cusColumns = ""; + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContexts.get(0).getCustomDetailInfo())); + for (String key : (Set) custom.keySet()) { + cusColumns = cusColumns + ", " + key; + } + sb.append(cusColumns); + } + sb.append(")"); + if ("oracle".equalsIgnoreCase(databaseId)) { + sb.append(" ").append(String.join(" UNION ALL ", getBatchInsertValue(context, hasCustonInfo, true))); + } else { + sb.append(" VALUES ").append(String.join(",", getBatchInsertValue(context, hasCustonInfo, false))); + } + + try { + getLocalElogAopDaoMapper().batchInsertDetail(sb.toString()); + } catch (Exception e) { + logger.error("明细批量添加sql是:{},批量插入明细失败，{}", sb.toString(), e.getMessage(), e); + } + + + } + + + private List getBatchInsertValue(LoggerContext context, boolean hasCustomInfo, boolean isOracle) { + + LocalDateTime localDateTime = LocalDateTime.now(); + String nowDate = localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + + List detailContexts = context.getDetailContexts(); + List batchValue = new ArrayList<>(); + for (LoggerDetailContext detailContext : detailContexts) { + detailContext.setTenant_key(context.getTenant_key()); + detailContext.setCreator(context.getLogOperator()); + detailContext.setId(IdGenerator.generate()); + + StringBuilder sb = new StringBuilder(); + sb.append(isOracle ? " SELECT " : " ( "); + sb.append(detailContext.getId()) + .append(",'").append(context.getUuid()).append("'") + .append(",'").append(detailContext.getUuid()).append("'") + .append(",'").append(detailContext.getTableName()).append("'") + .append(",'").append(detailContext.getFieldName()).append("'") + .append(",'").append(transferString(detailContext.getNewValue())).append("'") + .append(",'").append(transferString(detailContext.getOldValue())).append("'") + .append(",'").append(detailContext.getFieldDesc()).append("'") + .append(",'").append(detailContext.getShoworder()).append("'") + .append(",'").append(detailContext.getDataid()).append("'") + .append(",'").append(detailContext.getBelongDataid()).append("'") + .append(",'").append(detailContext.getIsDetail()).append("'") + .append(",'").append(detailContext.getTenant_key()).append("'") + .append(",'").append(detailContext.getCreator()).append("'") + .append(",'").append(transferString(detailContext.getNewRealValue())).append("'") + .append(",'").append(transferString(detailContext.getOldRealValue())).append("'") + .append(",'").append(detailContext.getTableNameDesc()).append("'") + .append(",'").append(detailContext.getTableNameLabelId()).append("'") + .append(",'").append(detailContext.getFieldNameLabelId()).append("'") + .append(",").append(handleValue(nowDate, databaseId)) + .append(",").append(handleValue(nowDate, databaseId)); + + if (hasCustomInfo) { + String cusValus = ""; + //如果有明细 + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContext.getCustomDetailInfo())); + for (String key : (Set) custom.keySet()) { + String keystr = custom.getString(key); + //如果keystr包含单引号，将单引号去掉 + if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { + keystr = keystr.replace("'", "''"); + } + cusValus = cusValus + ",'" + keystr + "'"; + } + sb.append(cusValus); + } + String sql = isOracle ? sb.append(" from dual ").toString() : sb.append(")").toString(); + + batchValue.add(sql); + } + + return batchValue; + } + + private String transferString(String str) { + if (StringUtils.isNotEmpty(str)) { + str = str.replaceAll("#\\{", "\\\\\\\\#{"); + if (str.contains("'")) { + str = str.replace("'", "''"); + } + } + return str; + } + + + private String handleValue(String nowDate, String databaseId) { + switch (databaseId) { + case "mysql": + return "'" + nowDate + "'"; + case "oracle": + return "TO_DATE('" + nowDate + "','YYYY-MM-DD HH24:MI:SS')"; + case "sqlserver": + return "'" + nowDate + "'"; + case "postgresql": + return "'" + nowDate + "'"; + + } + return nowDate; + } + +// private void insertESElogCenter(LoggerContext context, String customInfo, String tableName) { +// //将数据转换为ES的数据格式 +// LogESDoc logESDoc = LogESDoc.context2Doc(context, customInfo, tableName); +// String json = JSON.toJSONString(logESDoc); +// String elogESTableName = ElogEsUtils.getElogESTableName(true, ElogEsUtils.getDateStr(context.getDate())); +// IndexRequest indexRequest = new IndexRequest(elogESTableName).id(logESDoc.getId().toString()); +// indexRequest.source(json, XContentType.JSON); +// +// try { +// client.index(indexRequest, RequestOptions.DEFAULT); +// } catch (IOException e) { +//// logger.info("主表数据添加失败:{}",e.getMessage()); +// } +// } + + + @Override + public int insertElogDetail(LoggerDetailContext loggerDetailContext, String mainId, String detailTableName) { + String cusColumns = ""; + String cusValus = ""; + if (loggerDetailContext.getCustomDetailInfo() != null) { + JSONObject custom = JSONObject.parseObject(JSON.toJSONString(loggerDetailContext.getCustomDetailInfo())); + + for (String key : (Set) custom.keySet()) { + cusColumns = cusColumns + ", " + key; + String keystr = custom.getString(key); + //如果keystr包含单引号，将单引号去掉 + if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { + keystr = keystr.replace("'", "''"); + } + cusValus = cusValus + ",'" + keystr + "'"; + } + } + loggerDetailContext.setId(IdGenerator.generate()); + return getLocalElogAopDaoMapper().insertElogDetail(loggerDetailContext, mainId, cusColumns, cusValus, detailTableName); + + } + +// @Override +// public void rollBackElog(LoggerContext context) { +// //根据ID 判断数据是否存在 +// +// String tableName = getElogTableName(context.getModuleName(), context.getFunctionName()); +// Integer id = getLocalElogAopDaoMapper().queryElogContextById(context.getId(), tableName); +// //没查到就直接返回 +// if (id == null) { +// lazyRollBack.delayedRollBack(context); +// return; +// } +// getLocalElogAopDaoMapper().rollBackElogById(context.getId(), tableName); +// +//// if (context.getDetailContexts() != null) { +// String detailTableName = context.getModuleName() + "_" + context.getFunctionName() + "logs_detail"; +// //根据uuid回滚 +// getLocalElogAopDaoMapper().rollBackDetailElogByUUID(context.getUuid(), detailTableName); +//// } +// +// +// } + + /** + * 判断字符串是否为日期格式 + */ + public static Boolean checkStrIsDate(String str) { + if (StringUtils.isBlank(str)) { + return false; + } else { + try { + LocalDateTime.parse(str, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + return true; + } catch (Exception e) { + return false; + } + } + } + + private String getElogTableName(String moduleName, String functionName) { + +// List list = Arrays.asList("meetingTopic", "meetingService", "meetingDecision", "meetingSign", "meetingSignSet", "meetingMember", "meetingShare"); + +// if (list.contains(moduleName)) { +// return "meeting"+ "_" + functionName + "logs"; +// } + + return moduleName + "_" + functionName + "logs"; + + } + +} diff --git a/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java b/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java new file mode 100644 index 000000000..81eb070f0 --- /dev/null +++ b/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java @@ -0,0 +1,75 @@ +package com.engine.salary.elog.threadlocal; + +import com.alibaba.fastjson.JSONObject; +import com.engine.salary.elog.dto.LoggerContext; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Date: 2022/5/18 20:26 + * @Author: deli.xu + * @Description: + **/ +public class ElogThreadLocal { + + private static final ThreadLocal> loggerContextList = new ThreadLocal<>(); + private static final ThreadLocal requestBody = new ThreadLocal<>(); + + public static LoggerContext currentLoggerContext() { + List list = loggerContextList.get(); + + if(list == null || list.size() == 0) { + return null; + } else { + return list.get(list.size() -1); + } + } + + public static void addLoggerContext(LoggerContext loggerContext) { + if(loggerContext == null) + return; + List list = loggerContextList.get(); + if(list == null) { + list = new ArrayList<>(); + loggerContextList.set(list); + } + + list.add(loggerContext); + + } + + public static List getLoggerContextList() { + return loggerContextList.get(); + } + + public static void clear() { + loggerContextList.set(null); + } + + public static void removeLast() { + List list = loggerContextList.get(); + + if(list != null) { + int size = list.size(); + if(size > 0) + list.remove(size - 1); + } + } + + public static void remove() { + loggerContextList.remove(); + } + + public static JSONObject getRequestBody() { + return requestBody.get(); + } + + public static void setRequestBody(JSONObject json) { + requestBody.set(json); + } + + public static void removeRequestBody() { + requestBody.remove(); + } +} diff --git a/src/com/engine/salary/elog/util/ElogUtils.java b/src/com/engine/salary/elog/util/ElogUtils.java index d2203f7ab..5e792fbdd 100644 --- a/src/com/engine/salary/elog/util/ElogUtils.java +++ b/src/com/engine/salary/elog/util/ElogUtils.java @@ -1,6 +1,27 @@ package com.engine.salary.elog.util; -import com.engine.salary.elog.dto.DateTypeEnum; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.enums.FromTerminalType; +import com.engine.salary.elog.threadlocal.ElogThreadLocal; +import org.apache.commons.lang3.StringUtils; +import org.apache.dubbo.common.utils.CollectionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; /** * @ClassName: ElogUtils @@ -8,25 +29,44 @@ import com.engine.salary.elog.dto.DateTypeEnum; * @Author tanghj * @Date 2021/3/12 14:17 */ +@Component public class ElogUtils { + private static final Logger logger = LoggerFactory.getLogger(ElogUtils.class); + + + private static final String TABLE_SPACER = "_"; private static final String TABLE_SUFFIX = "logs"; - private static final String DETAIL_TABLE_SUFFIX = "detail"; + private static final String DETAIL_TABLE_SUFFIX = "_detail"; public static final String BASE_TABLE = "BASE_ELOG_TABLE"; + public String getApplicationName() { + return applicationName; + } + + public void setApplicationName(String applicationName) { + this.applicationName = applicationName; + } + +// @Value("${spring.application.name}") + public static String applicationName; + + public static String getTableName(String module, String function) { return getTableName(module, function, false); } - public static String getTableName(String module, String function, boolean isDetail){ - - return module + TABLE_SPACER + function + TABLE_SUFFIX + (isDetail ? DETAIL_TABLE_SUFFIX : ""); + public static String getTableName(String module, String function, boolean isDetail) { + String tablename = module + TABLE_SPACER + function + TABLE_SUFFIX + (isDetail ? DETAIL_TABLE_SUFFIX : ""); +// SecurityUtil.sqlCheck(tablename); + return tablename; } /** * String 转枚举 + * * @param c * @param string * @param @@ -42,9 +82,706 @@ public class ElogUtils { return null; } - public static void main(String[] args) { - System.out.println(DateTypeEnum.BIGINT.name()); - DateTypeEnum columnTypeEnum = getEnumFromString(DateTypeEnum.class, "varchar"); - System.out.println(columnTypeEnum.equals(DateTypeEnum.VARCHAR)); + /** + * 获取ip地址 + * + * @param request + * @return + */ + public static String getIp(HttpServletRequest request) { + String ipAddress = request.getHeader("x-forwarded-for"); + String unknown = "unknown"; + if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("Proxy-Client-IP"); + } + if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("WL-Proxy-Client-IP"); + } + if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { + ipAddress = request.getRemoteAddr(); + String benji = "127.0.0.1"; + String bj = "0:0:0:0:0:0:0:1"; + if (benji.equals(ipAddress) || bj.equals(ipAddress)) { + ///根据网卡取本机配置的IP + InetAddress inet = null; + try { + inet = InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + logger.error("UnknownHostException", e); + } + if (inet != null) { + ipAddress = inet.getHostAddress(); + } + } + } + ///对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 + int i = 15; + String s = ","; + if (ipAddress != null && ipAddress.length() > i) { + if (ipAddress.indexOf(s) > 0) { + ipAddress = ipAddress.substring(0, ipAddress.indexOf(",")); + } + } + return ipAddress; } + + /** + * 获取设备信息 + * + * @param request + * @return + */ + public static String getDevice(HttpServletRequest request) { + return request.getHeader("User-Agent"); + } + + /** + * 获取来自终端的信息 + * + * @param context + * @param request + * @return + */ + public static void getFromTerminal(LoggerContext context, HttpServletRequest request) { + String fromTerminal = context.getFromTerminal(); + if (StringUtils.isEmpty(fromTerminal)) { + String device = getDevice(request); + String setFT = ""; + if (StringUtils.isNotEmpty(device)) { + context.setFromTerminal(getFromTerminal(device)); + } + } + } + + public static void initRequestInfo(HttpServletRequest request, LoggerContext context) { + if (StringUtils.isEmpty(context.getRequestUrl())) { + context.setRequestUrl(getRequestUrl(request)); + } + if (StringUtils.isEmpty(context.getRequestUri())) { + context.setRequestUri(getRequestMethod(request) + ":" + getRequestUri(request)); + } + //if (context.getParams() == null) { + //默认记录params，此参数给true时 或报表服务，不记录 + if (!context.getParamsIgnore() && !applicationName.equalsIgnoreCase("weaver-edcreportd-service")) { + context.setParams(getRequstParam(request,context)); + } + // } + if (StringUtils.isEmpty(context.getClientIp())) { + context.setClientIp(getIp(request)); + } + if (StringUtils.isEmpty(context.getDevice())) { + context.setDevice(getDevice(request)); + } + if (StringUtils.isEmpty(context.getFromTerminal())) { + context.setFromTerminal(getFromTerminal(getDevice(request))); + } + if (StringUtils.isEmpty(context.getBelongMainId())) { + context.setBelongMainId(getTraceId(request)); + } + + } + + private static String getTraceId(HttpServletRequest request) { + String traceId = request.getHeader("traceId"); + if (StringUtils.isNotBlank(traceId)) { + //System.out.println("traceId:====="+traceId); + return traceId; + } + return ""; + } + + /** + * @param request + * @return localhost:9080/api/fs/demo/updateReport + */ + public static String getRequestUrl(HttpServletRequest request) { + if (Objects.isNull(request) || Objects.isNull(request.getRequestURL())) { + return null; + } + return request.getRequestURL().toString(); + } + + /** + * @param request + * @return /api/fs/demo/updateReport + */ + public static String getRequestUri(HttpServletRequest request) { + return request.getRequestURI(); + } + + /** + * @param request + * @return GET/POST + */ + public static String getRequestMethod(HttpServletRequest request) { + return request.getMethod(); + } + + public static Map getRequstParam(HttpServletRequest request, LoggerContext context) { + return request2Map(request, context); + } + + /** + * 获取当前方法中的日志实体类 + * + * @return + */ + public static LoggerContext currentElogContext() { + return ElogThreadLocal.currentLoggerContext(); + } + + public static Map request2Map(HttpServletRequest request, LoggerContext context) { + // 参数Map + Map properties = request.getParameterMap(); + // 返回值Map + Map returnMap = new HashMap(); + Iterator entries = properties.entrySet().iterator(); + Map.Entry entry; + String name = ""; + Object value = null; + while (entries.hasNext()) { + entry = (Map.Entry) entries.next(); + name = (String) entry.getKey(); + Object valueObj = entry.getValue(); + if (null == valueObj) { + value = null; + } else if (valueObj instanceof String[]) { + String[] values = (String[]) valueObj; + if (values.length == 1) { + value = values[0]; + } else { + value = values; + } + } else { + value = valueObj.toString(); + } + returnMap.put(name, value); + } + //放入ip + returnMap.put("param_ip", getIp(request)); + returnMap.put("request_header_user_agent", request.getHeader("user-agent")); + JSONObject body = ElogThreadLocal.getRequestBody(); + if (body != null) { +// returnMap.put("request_body", body); + setReturnMapBody(returnMap,context.getParamsBodyKeys(),body); + } + return returnMap; + } + + public static void setReturnMapBody(Map returnMap,List keys,JSONObject body) { + //模块没设置则全部记录 + if (CollectionUtils.isEmpty(keys)) { + returnMap.put("request_body", body); + }else { + JSONObject newBody = new JSONObject(); + for (String key : keys) { + newBody.put(key,body.get(key)); + } + returnMap.put("request_body", newBody); + } + } + + public static int getIntValue(String v) { + return getIntValue(v, -1); + } + + public static int getIntValue(String v, int def) { + try { + return Integer.parseInt(v); + } catch (Exception var3) { + return def; + } + } + + public static long getLongValue(String v) { + return getLongValue(v, -1l); + } + + public static long getLongValue(String v, long def) { + try { + return Long.parseLong(v); + } catch (Exception var3) { + return def; + } + } + + public static boolean isLongValue(String v) { + try { + Long.parseLong(v); + } catch (Exception e) { + return false; + } + return true; + } + + public static int currentLanguage() { +// String employeeId = getEmployeeId(); +// if (employeeId != null) { +// return I18nLanguageUtil.getLangId(Long.parseLong(employeeId)); +// } else { +// return 7; +// } + return 7; + } + +// /** +// * 获取request请求 +// * +// * @return +// */ +// public static HttpServletRequest getRequest() { +// return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// } + + /** + * 将对象转换程字符串 + * + * @param obj 目标对象 + * @param def 如果为null时的默认值 + * @return + */ + public static String null2String(Object obj, String def) { + return obj == null ? def : obj.toString(); + } + + public static String null2String(Object obj) { + return null2String(obj, ""); + } + + public static int getIntValue(Object obj, int def) { + try { + return Integer.parseInt(null2String(obj)); + } catch (Exception ex) { + return def; + } + } + +// public static Page getPage() { +// HttpServletRequest request = getRequest(); +// String num = request.getParameter("pageNum"); +// String size = request.getParameter("pageSize"); +// +// Page page = new Page(ElogUtils.getIntValue(num, 1), ElogUtils.getIntValue(size, 10)); +// return page; +// } + +// public static void main(String[] args) { +// //System.out.println(getTableName("select", "from")); +// //DataTypeEnum columnTypeEnum = getEnumFromString(DataTypeEnum.class, "varchar"); +// } + + public static List switchString(List list) { + if (list != null) { + return list.stream().map(m -> { + Set en = m.entrySet(); + for (Map.Entry entry : en) { + if (entry.getValue() != null) { + entry.setValue(String.valueOf(entry.getValue())); + } + } + return m; + }).collect(Collectors.toList()); + } else { + return list; + } + } + + public static List switchComplexString(List list) { + if (list != null) { + return list.stream().map(m -> { + Iterator iterator = m.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry next = iterator.next(); + if (next.getValue() != null) { + if (next.getValue() instanceof Map && "parmas".equals(next.getKey())) { + next.setValue(String.valueOf(next.getValue())); + } + if (next.getValue() instanceof List) { + } else { + next.setValue(String.valueOf(next.getValue())); + } + } + } + return m; + }).collect(Collectors.toList()); + } else { + return list; + } + } + +// public static String getTenantKey() { +// +// String tenantKey = TenantRpcContext.getTenantKey(); +// if (StringUtils.isNotBlank(tenantKey)) { +// return tenantKey; +// } +// +// return ""; +// } +// +// public static String getEmployeeId() { +// +// String employeeId = TenantRpcContext.getEmployeeId(); +// if (StringUtils.isNotBlank(employeeId)) { +// return employeeId; +// } +// +// return ""; +// } + + public static String getUserName() { + +// String employeeId = getEmployeeId(); +// if (StringUtils.isNotEmpty(employeeId)) { +// HrmEmployeeComInfo simpleEmployee = null; +// try { +// ComInfoCache bean = SpringUtils.getBean(ComInfoCache.class); +// if (bean != null) { +// simpleEmployee = bean.getCacheById(HrmEmployeeComInfo.class, ElogUtils.getLongValue(employeeId)); +// } +// } catch (Exception e) { +// logger.error("Exception", e); +// } +// if (simpleEmployee != null) { +// if (StringUtils.isNotBlank(simpleEmployee.getUsername())) { +// return simpleEmployee.getUsername(); +// } +// } +// } + + + return ""; + } + + /** + * 获取rpc信息（客户端ip和来源设备） + * + * @param context + */ + public static void initRpcInfo(LoggerContext context) { +// String device = ""; +// String clientIp = ""; +// String traceId = ""; +// try { +// device = RpcContext.getContext().getAttachment(EteamsConstant.DEVICE); +// clientIp = RpcContext.getContext().getAttachment(EteamsConstant.CLIENT_IP); +// traceId = RpcContext.getContext().getAttachment(ApmConstant.TRACE_ID); +//// logger.info("rpc调用获取到 device:{},clientIp:{},traceId:{}", device, clientIp, traceId); +// } catch (Exception e) { +// logger.error("Exception", e); +// } +// if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { +// context.setDevice(device); +// } +// if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { +// context.setFromTerminal(getFromTerminal(device)); +// } +// +// if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { +// context.setClientIp(clientIp); +// } +// if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { +// context.setBelongMainId(traceId); +// } + } + + public static String getFromTerminal(String device) { + String setFT = ""; + if (StringUtils.isNotEmpty(device)) { + if (!device.contains("wxwork") && device.contains("MicroMessenger")) {//来自微信 + setFT = FromTerminalType.MICO_MSG.getCode(); + } else if (device.contains("wxwork") && device.contains("MicroMessenger")) {//企业微信 + setFT = FromTerminalType.WECHAT.getCode(); + } else if (device.contains("iPhone") && device.contains("Mac")) {//来自 Iphone + setFT = FromTerminalType.IOS.getCode(); + } else if (device.contains("Mac OS") && !device.contains("iPhone") && device.contains("weapp-pc")) {//来自 mac_client + setFT = FromTerminalType.MAC_CLIENT.getCode();//mac_client + } else if (!device.contains("wxwork") && device.contains("Mobile")) {//移动端 + setFT = FromTerminalType.H5.getCode(); + } else if (device.contains("Android") && !device.contains("wxwork")) {//来自安卓 包含安卓并且不包含微信 + setFT = FromTerminalType.ANDROID.getCode(); + } else {//pc + setFT = FromTerminalType.PC.getCode(); + } + } + return setFT; + } + + /** + * sql连接条件注入sql + * + * @param condition + * @return + */ + public static String checkConditionSql(String condition) { + if ("AND".equalsIgnoreCase(condition) || + "OR".equalsIgnoreCase(condition) + ) { + return condition; + } + return "AND"; + } + + public static String checkTypeSql(String type) { + if ("LIKE".equalsIgnoreCase(type) || + "IN".equalsIgnoreCase(type) || + "!<>".equalsIgnoreCase(type) || + "!=".equalsIgnoreCase(type) || + "BETWEEN".equalsIgnoreCase(type) || + "IS NULL".equalsIgnoreCase(type) || + "IS NULL".equalsIgnoreCase(type) || + "=".equalsIgnoreCase(type) || + "IS NOT NULL".equalsIgnoreCase(type)) { + return type; + } + return "="; + } + + /** + * sql条件防止注入 + * + * @param value + * @return + */ + public static String checkValSql(String value) { + Pattern p = Pattern.compile("\\s+"); + Matcher m = p.matcher(value); + String val = m.replaceAll(" "); + String[] keywords = {"master", "truncate", "declare", "alert", "create", "drop", "version", + "show", "table", "index", "insert", "into", "from", + "insert", "select", "delete", "update", "chr", "mid", "master", "truncate", "char", "declare", "union"}; + + + int count = 0; + String filterVal = ""; + for (String keyddlword : keywords) { + if (val.toLowerCase().contains(keyddlword)) { + count++; + if (count == 1) { + filterVal = keyddlword; + } + } + } + + if (count > 2) { + return filterVal; + } +// value = SecurityUtil.ecodeForSql(value); + + return value; + } + + /** + * 压缩工具类- + * + * @param str + * @return desc:version 0.0.1 基于jdk自带 GZIP 压缩。最后转成base64。 + * 市面上有其他压缩像jdk 的 deflate 可以设置压缩级别，但是都是主动的，需要改业务方法， + * snappy 压缩适用于大数据压缩。大数据量比较快 hadoop首选，但是压缩后比例比较大。 + * xz 下的 压缩比率大，但是解压比较慢-不提倡，空间换时间了 + * common下的压缩其实和jdk差不多，网上说优于jdk，但是相差不大。 + * weaver 压缩基于jdk + */ + public static String compress(String str) { + if (str == null || str.trim().length() == 0) { + return str; + } + try (ByteArrayOutputStream out = new ByteArrayOutputStream(); + GZIPOutputStream gzip = new GZIPOutputStream(out)) { + gzip.write(str.getBytes()); + gzip.close(); + return Base64.getEncoder().encodeToString(out.toByteArray()); + } catch (Exception e) { + logger.error("压缩失败", e.getMessage()); + return str; + } + + } + + + /** + * 解压缩 + * + * @param str + * @return + */ + public static String uncompress(String str) { + byte[] decode = Base64.getDecoder().decode(str); + if (str == null || str.trim().length() == 0) { + return str; + } + try (ByteArrayOutputStream out = new ByteArrayOutputStream(); + ByteArrayInputStream in = new ByteArrayInputStream(decode)) { + GZIPInputStream ungzip = new GZIPInputStream(in); + byte[] buffer = new byte[2048]; + int n; + while ((n = ungzip.read(buffer)) >= 0) { + out.write(buffer, 0, n); + } + return new String(out.toByteArray()); + } catch (Exception e) { + logger.error("解缩失败：{}", e.getMessage()); + return str; + } + } + + public static LoggerContext getEsField(LoggerContext context, String field) { + + switch (field.toLowerCase()) { + case "interfacename": + context.setInterfaceName(""); + break; + case "operatetype": + context.setOperateType(""); + break; + case "operatedesc": + context.setOperatedesc(""); + break; + case "params": + context.setParamsStr("ES"); + break; + case "clientip": + context.setClientIp(""); + break; + case "groupnamelabel": + context.setGroupNameLabel(""); + break; + case "redoservice": + context.setRedoService(""); + break; + case "redocontext": + context.setRedoContextStr(""); + break; + case "cancelservice": + context.setCancelService(""); + break; + case "cancelcontext": + context.setCancelContextStr(""); + break; + case "device": + context.setDevice(""); + break; + case "groupid": + context.setGroupId(""); + break; + case "belongmainid": + context.setBelongMainId(""); + break; + case "requesturl": + context.setRequestUrl(""); + break; + case "requesturi": + context.setRequestUri(""); + break; + case "log_result": + context.setResult(""); + break; + case "fromterminal": + context.setFromTerminal(""); + break; + case "resultdesc": + context.setResultDesc(""); + break; + case "old_content": + context.setOld_content(""); + break; + case "link_type": + context.setLink_type(""); + break; + } + + return context; + } + + public static String[] getESfields(String value) { + String[] split = value.split(","); + List list = new ArrayList<>(); + for (String s : split) { + switch (s.toLowerCase()) { + case "interfacename": + list.add("interfacename"); + break; + case "operatetype": + list.add("operatetype"); + break; + case "operatedesc": + list.add("operatedesc"); + break; + case "params": + list.add("params"); + break; + case "clientip": + list.add("clientip"); + break; + case "groupnamelabel": + list.add("groupnamelabel"); + break; + case "redoservice": + list.add("redoservice"); + break; + case "redocontext": + list.add("redocontext"); + break; + case "cancelservice": + list.add("cancelservice"); + break; + case "cancelcontext": + list.add("cancelcontext"); + break; + case "device": + list.add("device"); + break; + case "groupid": + list.add("groupid"); + break; + case "belongmainid": + list.add("belongmainid"); + break; + case "requesturl": + list.add("requesturl"); + break; + case "requesturi": + list.add("requesturi"); + break; + case "log_result": + list.add("logResult"); + break; + case "fromterminal": + list.add("fromterminal"); + break; + case "resultdesc": + list.add("resultdesc"); + break; + case "old_content": + list.add("oldContent"); + break; + case "link_type": + list.add("linkType"); + break; + } + } + //list转为数组 + if (list.size() > 0) { + String[] strings = list.toArray(new String[list.size()]); + return strings; + } + return null; + } + + public static String handleClobColumn(String value) { + // 处理超长字符串，oracle插入报错ORA-01704: string literal too long + if (StringUtils.isBlank(value)){ + return ""; + } + StringBuilder formatValue = new StringBuilder(); + String[] split = StrUtil.split(value, 1000); + for (int i = 0; i < split.length; i++) { + formatValue.append("TO_CLOB('").append(split[i]).append("')"); + if (i != split.length - 1) { + formatValue.append("||"); + } + } + return formatValue.toString(); + } + } diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java index 6dc03b33c..c5584bc62 100644 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -1,12 +1,23 @@ package com.engine.salary.elog.util; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.elog.async.LoggerMessageListener; import com.engine.salary.elog.dto.LoggerContext; import com.engine.salary.elog.dto.LoggerDetailContext; import com.engine.salary.elog.dto.TableChangeBean; +import dm.jdbc.util.IdGenerator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.dubbo.common.utils.AnnotationUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.lang.reflect.Field; import java.util.*; @@ -17,6 +28,7 @@ import java.util.*; * @Author tanghj * @Date 2021/2/10 14:18 */ +//@Component public class LoggerTemplate { protected String function = "common"; @@ -24,8 +36,38 @@ public class LoggerTemplate { protected String logCenterQueue = "Elog_cneterlogQueue"; + public static final String AUDITLOGQUEUE = "AuditLog"; + public static final String ELOG = "Elog"; + protected String localQueue; + protected String moduleName; + + protected static String applicationName; + + public void setApplicationName(String applicationName) { + LoggerTemplate.applicationName = applicationName; + } + + public String getApplicationName() { + return applicationName; + } + + private static final Logger logger = LoggerFactory.getLogger(LoggerTemplate.class); + + protected static String publishkitGroup; + + public void setPublishkitGroup(String publishkitGroup) { + LoggerTemplate.publishkitGroup = publishkitGroup; + } + + public String getPublishkitGroup() { + return publishkitGroup; + } + + + LoggerMessageListener loggerMessageListener = new LoggerMessageListener(); + /** * 写入日志消息队列 * @@ -42,15 +84,198 @@ public class LoggerTemplate { * @param isLocal true 存储本地， false不存储本地 */ public void write(LoggerContext context, boolean isLocal) { - handleContext(context); - if (isLocal) { - new LoggerMessageListener().receive(context); + String elogLocalQueue = ELOG + this.applicationName; + if (StringUtils.isEmpty(this.localQueue)) + this.localQueue = (StringUtils.isNotEmpty(this.moduleName) ? this.moduleName : elogLocalQueue) + "LocalQueue" + this.publishkitGroup; + try { + handleContext(context); + } catch (Exception e) { + logger.error("handleContext方法异常！{}", e.getMessage(), e); } + loggerMessageListener.receiveold(context); + } +// public void writeLocal(LoggerContext context){ +// String elogLocalQueue = ELOG + this.applicationName; +// if(StringUtils.isEmpty(this.localQueue)) +// this.localQueue = (StringUtils.isNotEmpty(this.moduleName) ? this.moduleName : elogLocalQueue) + "LocalQueue" + this.publishkitGroup; +// AsyncBean asyncBean = new AsyncBean<>(); +// handleContext(context); +// if (context.getWeakElogReocrd() && CollectionUtils.isEmpty(context.getDetailContexts() )) { +// logger.info("日志弱控且没有明细记录，不记录日志,modulename:{},functionname:{}",context.getModuleName(),context.getFunctionName()); +// return; +// } +// +// try { +// asyncBean.setMessage(context); +// asyncBean.setQueue(localQueue); +// asyncClient.send(asyncBean); +// } catch (Exception e) { +// logger.error("发送writeLocal-mq消息异常！{}",e.getMessage(),e); +// } +// } + + +// public void checkAsyncBean(AsyncBean asyncBean) { +// int length = JSON.toJSON(asyncBean).toString().getBytes(StandardCharsets.UTF_8).length / 1000; +// boolean checkPass = length <= 5120; +// if (!checkPass) +// throw new RuntimeException("消息体超出5M，不支持发送!"); +// } + +// /** +// * 没有明细变化可以不写入日志 +// * @param context 日志信息 +// * @param isLocal 是否写入本地 +// * @param notChangeDetailSendLog 没有明细变化不写入日志 +// */ +// public void write(LoggerContext context, boolean isLocal,boolean notChangeDetailSendLog){ +// String elogLocalQueue = ELOG + this.applicationName; +// if(StringUtils.isEmpty(this.localQueue)) +// this.localQueue = (StringUtils.isNotEmpty(this.moduleName) ? this.moduleName : elogLocalQueue) + "LocalQueue"; +// AsyncBean asyncBean = new AsyncBean<>(); +// handleContext(context); +// +// if (notChangeDetailSendLog && (context.getDetailContexts() == null || context.getDetailContexts().size() == 0)) { +// return; +// } +// try { +// asyncBean.setMessage(context); +// asyncBean.setQueue(logCenterQueue); +// asyncClient.send(asyncBean); +// writeHrmLog(context); +// if(isLocal) { +// asyncBean.setQueue(localQueue); +// asyncClient.send(asyncBean); +// } +// } catch (Exception e) { +// logger.error("发送mq消息异常！{}",e.getMessage(),e); +// } +// +// } + +// /** +// * 支持了向其他模块服务发送业务日志 +// * @param context +// * @param isLocal +// * @param moduleName +// */ +// public void write(LoggerContext context, boolean isLocal, String moduleName){ +// +// if(StringUtils.isNotEmpty(moduleName)) { +// String localQueue = moduleName + "LocalQueue"; +// // context.setModuleName(moduleName); +// AsyncBean asyncBean = new AsyncBean<>(); +// handleContext(context); +// try { +// asyncBean.setMessage(context); +// asyncBean.setQueue(logCenterQueue); +// asyncClient.send(asyncBean); +// writeHrmLog(context); +// if(isLocal) { +// asyncBean.setQueue(localQueue); +// asyncClient.send(asyncBean); +// } +// } catch (Exception e) { +// logger.error("发送mq消息异常！:{}",e.getMessage()); +// } +// } else { +// write(context, isLocal); +// } +// +// } + +// public void writeHrmLog(LoggerContext context) { +// AsyncBean asyncBean = new AsyncBean<>(); +// handleContext(context); +// asyncBean.setMessage(context); +// //asyncBean.setTopic(WRITEAUDITLOGTOPIC); +// asyncBean.setQueue(AUDITLOGQUEUE); +// asyncClient.send(asyncBean); +// +// } + +// /** +// * 支持了向其他模块服务发送业务日志 +// * @param context +// * @param isLocal +// * @param moduleName +// */ +// public void write(LoggerContext context, boolean isLocal, String moduleName,String functionName,String queueName){ +// +// if (StringUtils.isNotEmpty(moduleName) && StringUtils.isNotEmpty(functionName)) { +// context.setModuleName(moduleName); +// context.setFunctionName(functionName); +// this.localQueue = queueName + "LocalQueue"; +// AsyncBean asyncBean = new AsyncBean<>(); +// handleContext(context); +// try { +// asyncBean.setMessage(context); +// asyncBean.setQueue(logCenterQueue); +// asyncClient.send(asyncBean); +// writeHrmLog(context); +// if (isLocal) { +// asyncBean.setQueue(localQueue); +// asyncClient.send(asyncBean); +// } +// } catch (Exception e) { +// logger.error("发送mq消息异常！,{}！",e); +// } +// } else { +// write(context, isLocal); +// } +// +// } + private void handleContext(LoggerContext context) { - context.setModuleName(module); - context.setFunctionName(function); + if (StringUtils.isEmpty(context.getModuleName())) + context.setModuleName(module); + if (StringUtils.isEmpty(context.getFunctionName())) + context.setFunctionName(function); + if (!(context.getId() > 0)) + context.setId(IdGenerator.generate()); + if (StringUtils.isEmpty(context.getUuid())) { + context.setUuid(UUID.randomUUID().toString().replace("-", "")); + } + + context.setTempParams(null); + //User user = UserContext.getCurrentUser(); + //if(user != null) { + // 通过统一登录获取 + String employeeId = "92"; + String tenantKey = SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; + String userName = ElogUtils.getUserName(); + //String userName = TenantRpcContext.getEmployeeId(); + if (StringUtils.isEmpty(context.getOperator()) && StringUtils.isNotEmpty(employeeId)) { + context.setOperator(employeeId + ""); + } + + if (StringUtils.isEmpty(context.getTenant_key()) && StringUtils.isNotEmpty(tenantKey)) { + context.setTenant_key(tenantKey); + } + if (StringUtils.isEmpty(context.getOperatorName()) && StringUtils.isNotEmpty(userName)) { + context.setOperatorName(userName); + } + //} + + if (StringUtils.isBlank(context.getOperator()) || "null".equals(context.getOperator())) { + context.setOperator("-1"); + } + if (StringUtils.isBlank(context.getTargetId()) || "null".equals(context.getTargetId())) { + context.setTargetId("-1"); + } + +// RequestAttributes requestAttributes = WeaverRequestContextHolder.getRequestAttributesSafely(); +// if ((requestAttributes instanceof ServletRequestAttributes)) { +// HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); +// ElogUtils.initRequestInfo(request, context);z +// } else { +// if (StringUtils.isEmpty(context.getRequestUrl())) { +// context.setRequestUrl("非http请求"); +// } +// ElogUtils.initRpcInfo(context); +// } List changeBeans = context.getChangeValues(); @@ -59,29 +284,81 @@ public class LoggerTemplate { if (changeBeans != null) for (TableChangeBean changeBean : changeBeans) { if (changeBean != null && (changeBean.getNewValue() != null || changeBean.getOldValue() != null)) { + String uuid = UUID.randomUUID().toString().replace("-", ""); ApiModel apiModel = null; + ElogTransform tableTransform = null; JSONObject newJo = new JSONObject(); JSONObject oldJo = new JSONObject(); - JSONObject valueChange = JSONObject.parseObject(JSONObject.toJSONString(changeBean)); + JSONObject valueChange = JSONObject.parseObject(JSONObject.toJSONString(changeBean, SerializerFeature.WriteDateUseDateFormat), Feature.OrderedField); + Field[] fields = null; if (changeBean.getNewValue() != null) { apiModel = changeBean.getNewValue().getClass().getAnnotation(ApiModel.class); + tableTransform = changeBean.getNewValue().getClass().getAnnotation(ElogTransform.class); + //增加处理被动态代理对象注解的逻辑 + if (Objects.isNull(tableTransform)) { + tableTransform = AnnotationUtils.findAnnotation(changeBean.getNewValue().getClass(), ElogTransform.class); + } + //fields = changeBean.getNewValue().getClass().getDeclaredFields(); + fields = getAllFields(changeBean.getNewValue().getClass()); newJo = valueChange.getJSONObject("newValue"); } else { apiModel = changeBean.getOldValue().getClass().getAnnotation(ApiModel.class); + tableTransform = changeBean.getOldValue().getClass().getAnnotation(ElogTransform.class); + if (Objects.isNull(tableTransform)) { + tableTransform = AnnotationUtils.findAnnotation(changeBean.getOldValue().getClass(), ElogTransform.class); + } + //fields = changeBean.getOldValue().getClass().getDeclaredFields(); + fields = getAllFields(changeBean.getOldValue().getClass()); } if (changeBean.getOldValue() != null) { oldJo = valueChange.getJSONObject("oldValue"); } - if (apiModel != null) { - Field[] fields = changeBean.getNewValue().getClass().getDeclaredFields(); + if ((apiModel != null || tableTransform != null) && fields != null) { + for (Field field : fields) { + if (StringUtils.isEmpty(newJo.getString(field.getName())) && StringUtils.isEmpty(oldJo.getString(field.getName()))) { + continue; + } + if (StringUtils.isNotEmpty(newJo.getString(field.getName())) && newJo.getString(field.getName()).equals(oldJo.getString(field.getName()))) { + continue; + } + ApiModelProperty apiModelProperty = field.getAnnotation(ApiModelProperty.class); + ElogTransform fieldElogTransform = field.getAnnotation(ElogTransform.class); LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - valueChangeBean.setTableName(changeBean.getTableName()); + if (fieldElogTransform != null && fieldElogTransform.ignore()) { + continue; + } + + //todo 若analyticList为true 且 新旧值属于JSONArray 解析List + if (fieldElogTransform != null && fieldElogTransform.analyticList() && fieldElogTransform.analyticListClass() != void.class) { + analyticListMethod(field, newJo, oldJo, valueChangeList, fieldElogTransform); + continue; + } + + valueChangeBean.setUuid(uuid); + valueChangeBean.setTableName(tableTransform != null && StringUtils.isNotEmpty(tableTransform.name()) ? tableTransform.name() : changeBean.getTableName()); + valueChangeBean.setTableNameDesc(tableTransform != null && StringUtils.isNotEmpty(tableTransform.tablename()) ? tableTransform.tablename() : ""); + valueChangeBean.setTableNameLabelId(tableTransform != null && tableTransform.labelId() != -1 ? tableTransform.labelId() + "" : ""); + valueChangeBean.setIsDetail(changeBean.getIsDetail()); valueChangeBean.setFieldName(field.getName()); - valueChangeBean.setFieldDesc(apiModelProperty.value()); + valueChangeBean.setFieldDesc(fieldElogTransform != null ? fieldElogTransform.name() : apiModelProperty != null ? apiModelProperty.value() : field.getName()); + valueChangeBean.setFieldNameLabelId(fieldElogTransform != null ? fieldElogTransform.labelId() + "" : "-1"); + valueChangeBean.setDataid(StringUtils.isNotEmpty(changeBean.getDataid()) ? changeBean.getDataid() : + StringUtils.isNoneEmpty(newJo.getString("id")) ? newJo.getString("id") : oldJo.getString("id")); + valueChangeBean.setBelongDataid(StringUtils.isNotEmpty(changeBean.getBelongDataid()) ? changeBean.getBelongDataid() : ""); + valueChangeBean.setNewValue(newJo.getString(field.getName())); valueChangeBean.setOldValue(oldJo.getString(field.getName())); + valueChangeBean.setCreator(-1l); + try { + extracted(newJo, oldJo, field, fieldElogTransform, valueChangeBean); + } catch (Exception e) { + logger.error("转换出错:{}", e); + //System.out.println("转换出错：" + e.getMessage()); + } + + valueChangeBean.setShoworder(showOrder++); valueChangeList.add(valueChangeBean); } @@ -89,26 +366,40 @@ public class LoggerTemplate { Set keys = new HashSet<>(); for (String key : (Set) newJo.keySet()) { keys.add(key); + if (newJo.getString(key).equals(oldJo.getString(key))) { + continue; + } LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + valueChangeBean.setUuid(uuid); valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setIsDetail(changeBean.getIsDetail()); + valueChangeBean.setDataid(StringUtils.isNotEmpty(changeBean.getDataid()) ? changeBean.getDataid() : + StringUtils.isNoneEmpty(newJo.getString("id")) ? newJo.getString("id") : oldJo.getString("id")); + valueChangeBean.setBelongDataid(StringUtils.isNotEmpty(changeBean.getBelongDataid()) ? changeBean.getBelongDataid() : ""); valueChangeBean.setFieldName(key); valueChangeBean.setFieldDesc(key); valueChangeBean.setNewValue(newJo.getString(key)); valueChangeBean.setOldValue(oldJo.getString(key)); valueChangeBean.setShoworder(showOrder++); + valueChangeBean.setCreator(-1l); valueChangeList.add(valueChangeBean); } - for (String key : (Set)oldJo.keySet()) { + for (String key : (Set) oldJo.keySet()) { if (keys.contains(key)) continue; keys.add(key); + if (oldJo.getString(key).equals(newJo.getString(key))) { + continue; + } LoggerDetailContext valueChangeBean = new LoggerDetailContext(); valueChangeBean.setTableName(changeBean.getTableName()); + valueChangeBean.setIsDetail(changeBean.getIsDetail()); valueChangeBean.setFieldName(key); valueChangeBean.setFieldDesc(key); valueChangeBean.setNewValue(newJo.getString(key)); valueChangeBean.setOldValue(oldJo.getString(key)); valueChangeBean.setShoworder(showOrder++); + valueChangeBean.setCreator(-1l); valueChangeList.add(valueChangeBean); } } @@ -119,6 +410,110 @@ public class LoggerTemplate { context.setDetailContexts(valueChangeList); } + + private void analyticListMethod(Field field, JSONObject newJo, JSONObject oldJo, List valueChangeList, ElogTransform tableTransform) { + JSONArray newValueArr = newJo.get(field.getName()) == null ? new JSONArray() : (JSONArray) newJo.get(field.getName()); + JSONArray oldvalueArr = oldJo.get(field.getName()) == null ? new JSONArray() : (JSONArray) oldJo.get(field.getName()); + Field[] allFields = getAllFields(tableTransform.analyticListClass()); + + + Boolean oldvalueIsNull = false; + Boolean newvalueIsNull = false; + + if (oldvalueArr.size() == 0) { + oldvalueIsNull = true; + } + if (newValueArr.size() == 0) { + newvalueIsNull = true; + } + if ((oldvalueIsNull && newvalueIsNull) || (!oldvalueIsNull && !newvalueIsNull && oldvalueArr.size() != newValueArr.size())) { + //如果新、旧没值或新旧值list数量对不上 直接返回 + return; + } + + JSONArray foreachArr = oldvalueIsNull ? newValueArr : oldvalueArr; + + //遍历list + for (int i = 0; i < foreachArr.size(); i++) { + //默认另一个list关系是一一对应的 + JSONObject oldValue = oldvalueIsNull ? new JSONObject() : (JSONObject) oldvalueArr.get(i); + JSONObject newValue = newvalueIsNull ? new JSONObject() : (JSONObject) newValueArr.get(i); + + //dataid uuid showOrder + long dataid = IdGenerator.generate(); + String uuid = UUID.randomUUID().toString().replace("-", ""); + int showOrder = 0; + + //遍历字段 + for (Field allField : allFields) { + if (StringUtils.isEmpty(newValue.getString(allField.getName())) && StringUtils.isEmpty(oldValue.getString(allField.getName()))) { + continue; + } + if (StringUtils.isNotEmpty(newValue.getString(allField.getName())) && newValue.getString(allField.getName()).equals(oldValue.getString(allField.getName()))) { + continue; + } + + ApiModelProperty apiModelProperty = allField.getAnnotation(ApiModelProperty.class); + ElogTransform fieldElogTransform = allField.getAnnotation(ElogTransform.class); + LoggerDetailContext valueChangeBean = new LoggerDetailContext(); + + valueChangeBean.setUuid(uuid); + valueChangeBean.setTableName(tableTransform != null && StringUtils.isNotEmpty(tableTransform.name()) ? tableTransform.name() : field.getName()); + valueChangeBean.setTableNameDesc(tableTransform != null && StringUtils.isNotEmpty(tableTransform.tablename()) ? tableTransform.tablename() : ""); + valueChangeBean.setTableNameLabelId(tableTransform != null && tableTransform.labelId() != -1 ? tableTransform.labelId() + "" : ""); + valueChangeBean.setIsDetail(1); + valueChangeBean.setFieldName(allField.getName()); + valueChangeBean.setNewValue(newValue.getString(allField.getName())); + valueChangeBean.setOldValue(oldValue.getString(allField.getName())); + valueChangeBean.setCreator(-1l); + valueChangeBean.setBelongDataid(""); + valueChangeBean.setDataid(String.valueOf(dataid)); + + if (fieldElogTransform != null) { + if (fieldElogTransform.ignore()) { + continue; + } + + valueChangeBean.setFieldDesc(fieldElogTransform != null ? fieldElogTransform.name() : apiModelProperty != null ? apiModelProperty.value() : field.getName()); + valueChangeBean.setFieldNameLabelId(fieldElogTransform != null ? fieldElogTransform.labelId() + "" : "-1"); + + try { + extracted(newValue, oldValue, allField, fieldElogTransform, valueChangeBean); + } catch (Exception e) { + logger.error("转换出错", e); + //System.out.println("转换出错：" + e.getMessage()); + } + + valueChangeBean.setShoworder(showOrder++); + } else { + valueChangeBean.setFieldDesc(allField.getName()); + valueChangeBean.setShoworder(showOrder++); + + } + valueChangeList.add(valueChangeBean); + } + } + } + + private void extracted(JSONObject newJo, JSONObject oldJo, Field field, ElogTransform fieldElogTransform, LoggerDetailContext valueChangeBean) { + JSONObject jo = null; + if (fieldElogTransform != null && StringUtils.isNotEmpty(fieldElogTransform.valuesKVPairs())) { + jo = JSONObject.parseObject(fieldElogTransform.valuesKVPairs()); + if (jo != null) { + valueChangeBean.setNewRealValue(jo.getString(newJo.getString(field.getName()))); + valueChangeBean.setOldRealValue(jo.getString(oldJo.getString(field.getName()))); + } + } + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public void setLocalQueue(String localQueue) { + this.localQueue = localQueue; + } + public String getFunction() { return function; } @@ -148,7 +543,99 @@ public class LoggerTemplate { } public void setModule(String module) { - this.localQueue = module + "LocalQueue"; this.module = module; } + +// public void setAsyncClient(AsyncClient asyncClient) { +// this.asyncClient = asyncClient; +// } + + + public static Field[] getAllFields(Class obj) { + Class superclass = obj.getSuperclass(); + Field[] superField = null; + //获取父类 + if (superclass != Object.class) { + superField = superclass.getDeclaredFields(); + } + //获取当前类 + Field[] nowfield = obj.getDeclaredFields(); + return addFields(superField, nowfield); + } + + public static Field[] addFields(Field[] superFields, Field[] fields) { + + return ArrayUtils.addAll(superFields, fields); + + } + + public void write(List context, boolean isLocal) { + context.forEach(loggerContext -> { + this.write(loggerContext, isLocal); + }); + } + + + public void write(List context) { + context.forEach(loggerContext -> { + this.write(loggerContext); + }); + } + +// public void writeAsync(LoggerContext context, boolean isLocal){ +// String applicationNameBak = this.applicationName; +// String localQueueBak = this.localQueue; +// String moduleNameBak = this.moduleName; +// String pk = this.publishkitGroup; +// LocalRunnable localRunnable = new LocalRunnable() { +// @Override +// public void execute() { +// String localQueueBakBak = localQueueBak; +// String elogLocalQueue = ELOG + applicationNameBak; +// if(StringUtils.isEmpty(localQueueBakBak)) +// localQueueBakBak = (StringUtils.isNotEmpty(moduleNameBak) ? moduleNameBak : elogLocalQueue) + "LocalQueue" + pk; +// AsyncBean asyncBean = new AsyncBean<>(); +// handleContext(context); +// if (context.getWeakElogReocrd() && CollectionUtils.isEmpty(context.getDetailContexts() )) { +// logger.info("日志弱控且没有明细记录，不记录日志,modulename:{},functionname:{}",context.getModuleName(),context.getFunctionName()); +// return; +// } +// try { +// asyncBean.setMessage(context); +// asyncBean.setQueue(logCenterQueue); +// checkAsyncBean(asyncBean);//检查消息体大小 +// asyncClient.send(asyncBean); +// writeHrmLog(context); +// if(isLocal) { +// asyncBean.setQueue(localQueueBakBak); +// asyncClient.send(asyncBean); +// } +// } catch (Exception e) { +// logger.error("发送mq消息异常！{}",e.getMessage(),e); +// } +// } +// }; +// ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.OTHER, "LoggerTemplate_writeAsync", localRunnable); +// +// } +// +// /** +// * 回滚队列 +// * +// * @param context +// */ +// public void writeRollBack(LoggerContext context){ +// String elogRollBackQueue = ELOG + this.applicationName + "RollBackQueue" + this.publishkitGroup; +// AsyncBean asyncBean = new AsyncBean<>(); +// +// try { +// asyncBean.setMessage(context); +// asyncBean.setQueue(elogRollBackQueue); +// checkAsyncBean(asyncBean);//检查消息体大小 +// asyncClient.send(asyncBean); +// } catch (Exception e) { +// logger.error("发送mq消息异常！{}",e.getMessage(),e); +// } +// } + } diff --git a/src/com/engine/salary/mapper/elog/TableCheckerMapper.java b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java similarity index 60% rename from src/com/engine/salary/mapper/elog/TableCheckerMapper.java rename to src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java index 5270ed5fe..5171e2641 100644 --- a/src/com/engine/salary/mapper/elog/TableCheckerMapper.java +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java @@ -4,8 +4,10 @@ import com.engine.salary.elog.dto.TableColumnBean; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; +import java.util.Set; -public interface TableCheckerMapper { +public interface ElogTableCheckerMapper { Long getVersion(@Param("mainTable") String mainTable); void recordVersion(@Param("id") long id, @Param("mainTable") String mainTable, @Param("version") long version); @@ -17,4 +19,12 @@ public interface TableCheckerMapper { List getTableStructure(@Param("tableName") String tableName); void createElogTable(@Param("createElogSql") String createElogSql); + + Map getTableIndex(@Param("tableName") String tableName, @Param("columnName") String columnName); + + Map getDataBase(); + + void createTableIndex(@Param("tableName") String tableName, @Param("columnName") String columnName, @Param("id") long id); + + List getAllExistTables(@Param("tableNames") Set tables); } diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml new file mode 100644 index 000000000..c345b7aba --- /dev/null +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml @@ -0,0 +1,451 @@ + + + + + insert into elog_version (id, maintable, version) values (#{id},#{mainTable},#{version}) + + + + create table ${mainTable} + ( + id bigint comment 'ID', + create_time datetime default current_timestamp , + update_time datetime default current_timestamp , + creator bigint, + delete_type int, + tenant_key varchar(10), + uuid char(36), + log_date datetime default current_timestamp , + log_operator varchar(50), + operatorName varchar(50), + targetId varchar(50), + targetName text, + modulename varchar(100), + functionname varchar(100), + interfaceName varchar(100), + requesturl varchar(200), + requesturi varchar(200), + operateType varchar(50), + operatetypename varchar(100), + operatedesc varchar(1000), + params longtext, + belongmainid varchar(36), + clientIp varchar(50), + groupid varchar(50), + device varchar(200), + groupNameLabel varchar(500), + redoService varchar(200), + redoContext longtext, + cancelService varchar(200), + cancelContext longtext, + totalruntime bigint, + mainruntime bigint, + log_result varchar(100), + fromterminal varchar(100), + resultdesc text, + old_content varchar(1000), + link_type varchar(20), + link_id bigint, + old_link_id bigint, + PRIMARY KEY (id) + ) + + + + create table ${mainTable} + ( + id number(*,0) not null primary key, + create_time date default sysdate, + update_time date default sysdate, + creator number(*,0), + delete_type number(*,0), + tenant_key varchar2(10), + uuid varchar2(36), + log_date date default sysdate, + log_operator varchar2(50), + operatorName varchar2(50), + targetId varchar2(50), + targetName varchar2(4000), + modulename varchar2(100), + functionname varchar2(100), + interfaceName varchar2(100), + requesturl varchar2(200), + requesturi varchar2(200), + operateType varchar2(50), + operatetypename varchar2(100), + operatedesc varchar2(1000), + params clob, + belongmainid varchar2(36), + clientIp varchar2(200), + groupid varchar2(50), + device varchar2(200), + groupNameLabel varchar2(500), + redoService varchar2(200), + redoContext varchar2(4000), + cancelService varchar2(200), + cancelContext varchar2(4000), + totalruntime number(*,0), + mainruntime number(*,0), + log_result varchar2(4000), + fromterminal varchar2(100), + resultdesc varchar2(4000), + old_content varchar2(1000), + link_type varchar2(20), + link_id number(*,0), + old_link_id number(*,0) + ) + + + create table ${mainTable} + ( + id bigint not null primary key, + create_time datetime default getdate(), + update_time datetime default getdate(), + creator bigint default '-1', + delete_type bigint default 0, + tenant_key nvarchar(10), + uuid nvarchar(36), + log_date datetime default getdate(), + device nvarchar(500), + log_operator bigint default '-1', + operatorname nvarchar(100), + targetid bigint default '-1', + targetname nvarchar(3000), + modulename nvarchar(100), + functionname nvarchar(100), + interfacename nvarchar(100), + requesturl nvarchar(200), + requesturi nvarchar(200), + operatetype nvarchar(50), + operatetypename nvarchar(100), + operatedesc nvarchar(3000), + params ntext, + belongmainid nvarchar(36), + clientip nvarchar(200), + groupid nvarchar(50), + groupnamelabel nvarchar(1000), + redoservice nvarchar(200), + redocontext nvarchar(3000), + cancelservice nvarchar(200), + cancelcontext nvarchar(3000), + totalruntime bigint default 0, + mainruntime bigint default 0, + log_result nvarchar(100), + fromterminal nvarchar(100), + resultdesc nvarchar(3000), + old_content nvarchar(3000), + link_type nvarchar(20), + link_id bigint default 0, + old_link_id bigint default 0 + ) + + + create table ${mainTable} + ( + id int8 not null primary key, + create_time timestamp default current_timestamp, + update_time timestamp default current_timestamp, + creator int8, + delete_type int, + tenant_key varchar(10), + uuid varchar(36), + log_date timestamp default current_timestamp, + log_operator varchar(50), + operatorName varchar(50), + targetId varchar(50), + targetName text, + modulename varchar(100), + functionname varchar(100), + interfaceName varchar(100), + requesturl varchar(200), + requesturi varchar(200), + operateType varchar(50), + operatetypename varchar(100), + operatedesc varchar(1000), + params text, + belongmainid varchar(36), + clientIp varchar(200), + groupid varchar(50), + device varchar(200), + groupNameLabel varchar(500), + redoService varchar(200), + redoContext text, + cancelService varchar(200), + cancelContext text, + totalruntime int4, + mainruntime int4, + log_result varchar(100), + fromterminal varchar(100), + resultdesc text, + old_content varchar(1000), + link_type varchar(20), + link_id int4, + old_link_id int4 + ) + + + create table ${detailTable} + ( + id bigint not null primary key, + create_time datetime default current_timestamp , + update_time datetime default current_timestamp , + creator bigint, + delete_type int, + tenant_key varchar(10), + uuid varchar(36), + mainid varchar(36), + dataid varchar(50), + belongdataid varchar(50), + tableName varchar(200), + tablenamelabelid varchar(50), + tablenamedesc varchar(50), + fieldName varchar(200), + fieldnamelabelid varchar(200), + newValue longtext, + oldValue longtext, + newrealvalue longtext, + oldrealvalue longtext, + fieldDesc varchar(200), + showorder int default 0, + isdetail int default 0 + ) + + + create table ${detailTable} + ( + id int8 not null primary key, + create_time timestamp default current_timestamp , + update_time timestamp default current_timestamp , + creator int8, + delete_type int8, + tenant_key varchar(10), + uuid varchar(36), + mainid varchar(36), + dataid varchar(50), + belongdataid varchar(50), + tableName varchar(200), + tablenamelabelid varchar(50), + tablenamedesc varchar(50), + fieldName varchar(200), + fieldnamelabelid varchar(200), + newValue text, + oldValue text, + newrealvalue text, + oldrealvalue text, + fieldDesc varchar(200), + showorder int8 default 0, + isdetail int8 default 0 + ) + + + create table ${detailTable} + ( + id number(*,0) not null primary key, + create_time date default sysdate, + update_time date default sysdate, + creator number(*,0), + delete_type number(*,0), + tenant_key varchar2(10), + uuid varchar2(36), + mainid varchar2(36), + dataid varchar2(50), + belongdataid varchar2(50), + tableName varchar2(200), + tablenamelabelid varchar2(50), + tablenamedesc varchar2(50), + fieldName varchar2(200), + fieldnamelabelid varchar2(200), + newValue varchar2(4000), + oldValue varchar2(4000), + newrealvalue varchar2(4000), + oldrealvalue varchar2(4000), + fieldDesc varchar2(200), + showorder number(*,0) default 0, + isdetail number(*,0) default 0 + ) + + + create table ${detailTable} + ( + id bigint not null primary key, + create_time datetime default getdate(), + update_time datetime default getdate(), + creator bigint, + delete_type bigint, + tenant_key nvarchar(10), + uuid nvarchar(36), + mainid nvarchar(36), + dataid nvarchar(50), + belongdataid nvarchar(50), + tableName nvarchar(200), + tablenamelabelid nvarchar(50), + tablenamedesc nvarchar(50), + fieldName nvarchar(200), + fieldnamelabelid nvarchar(200), + newValue ntext, + oldValue ntext, + newrealvalue ntext, + oldrealvalue ntext, + fieldDesc varchar(200), + showorder bigint default 0, + isdetail bigint default 0 + ) + + + + + + + + + + + ${createElogSql} + + + + + + + + + + + + + + + + create index idx${id} on ${tableName} (${columnName}) + + + + create index idx${id} on ${tableName} (${columnName}) + + + + create index idx${id} on ${tableName} (${columnName}) + + + + + + + + + + diff --git a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java new file mode 100644 index 000000000..6a969c83e --- /dev/null +++ b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java @@ -0,0 +1,45 @@ +package com.engine.salary.mapper.elog; + + +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.dto.LoggerDetailContext; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @ClassName: LocalElogAopDaoMapper + * @Description 本地操作日志持久层 + * @Author tanghj + * @Date 2021/2/24 9:35 + */ +public interface LocalElogAopDaoMapper { + + int insertElogContext(@Param(value="logContent") LoggerContext loggerContext, + @Param(value="cusColumns")String cusColumns , + @Param(value="cusValus")String cusValus, + @Param(value="tableName")String tableName); + + + + int insertElogDetail(@Param(value="detailContext") LoggerDetailContext loggerDetailContext, + @Param(value="mainid")String mainid, + @Param(value="cusColumns")String cusColumns , + @Param(value="cusValus")String cusValus, + @Param(value="detailTableName")String tableName); + + + Integer queryElogContextById(@Param(value="id")Long id, + @Param(value="tableName")String tableName); + + void batchInsertDetail(@Param("sql") String sql); + + void insertElogDetailPrepared(@Param("tablename") String detailTableName, @Param("list") List detailContexts, @Param("mainid") String mainid); + + void insertElogDetailPreparedHasCustonInfo(@Param("tablename") String detailTableName, @Param("list") List detailContexts, @Param("mainid") String mainid, @Param(value="cusColumns")String cusColumns); + + void rollBackElogById(@Param("id") Long id,@Param("tableName") String tableName); + + void rollBackDetailElogByUUID(@Param("mainid") String uuid,@Param("tableName") String detailTableName); + +} diff --git a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml new file mode 100644 index 000000000..4bd8ea6d2 --- /dev/null +++ b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml @@ -0,0 +1,150 @@ + + + + + + insert into ${tableName} (id, uuid, log_date, tenant_key, modulename, functionName, operatetypename, + log_operator, operatorname, targetid, targetname, interfacename, operatetype, + operatedesc, + params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice, + cancelcontext, device, groupid, + belongMainId, requestUrl, requestUri, totalRunTime, mainRunTime, log_result, + fromTerminal, resultDesc, old_content, + link_type, link_id, old_link_id, create_time, update_time, delete_type, creator + ${cusColumns}) + values (#{logContent.id}, #{logContent.uuid}, #{logContent.date}, + #{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName}, + #{logContent.operateTypeName}, #{logContent.logOperator}, #{logContent.operatorName}, + #{logContent.logTargetid} + , #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType}, + #{logContent.operatedesc}, + #{logContent.paramsStr}, #{logContent.clientIp}, #{logContent.groupNameLabel}, + #{logContent.redoService}, + #{logContent.redoContextStr}, #{logContent.cancelService}, #{logContent.cancelContextStr}, + #{logContent.device}, #{logContent.groupId}, + #{logContent.belongMainId}, #{logContent.requestUrl}, #{logContent.requestUri}, + #{logContent.totalRunTime}, #{logContent.mainRunTime} + , #{logContent.result}, #{logContent.fromTerminal}, #{logContent.resultDesc}, + #{logContent.old_content}, #{logContent.link_type} + , #{logContent.link_id}, #{logContent.old_link_id}, #{logContent.create_time}, + #{logContent.update_time}, #{logContent.delete_type}, #{logContent.logOperator} + ${cusValus}) + + + + insert into ${detailTableName} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key, creator, + newRealValue, oldRealValue, tableNameDesc, + tableNameLabelId, fieldNameLabelId, create_time, update_time + ${cusColumns}) + values (#{detailContext.id}, #{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, + #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, #{detailContext.tenant_key}, + #{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId}, #{detailContext.create_time}, #{detailContext.update_time} + ${cusValus}) + + + ${sql} + + + + + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) + values + + ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time}, #{logContent.delete_type}) + + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time + ${cusColumns}) + values + + ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time} + ${detailContext.cusValus}) + + + + + update ${tableName} + set delete_type = 3 + where id = #{id} + + + update ${tableName} + set delete_type = 3 + where mainid = #{mainid} + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) + + SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time}, #{logContent.delete_type} + FROM DUAL + + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time + ${cusColumns}) + + SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time} + ${detailContext.cusValus} + FROM DUAL + + + + diff --git a/src/com/engine/salary/mapper/elog/TableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/TableCheckerMapper.xml deleted file mode 100644 index a9e4436d3..000000000 --- a/src/com/engine/salary/mapper/elog/TableCheckerMapper.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - insert into elog_version (id, maintable, version) - values (#{id}, #{mainTable}, #{version}); - - - - create table ${mainTable} - ( - id bigint comment 'ID', - create_time datetime, - update_time datetime, - creator bigint, - delete_type int, - tenant_key varchar(10), - uuid char(36), - date datetime, - operator varchar(50), - operatorName varchar(50), - targetId varchar(50), - targetName varchar(1000), - module varchar(100), - `function` varchar(100), - interfaceName varchar(100), - operateType varchar(50), - desc varchar(1000), - params longtext, - clientIp varchar(50), - device varchar(200), - groupNameLabel varchar(500), - redoService varchar(200), - redoContext longtext, - cancelService varchar(200), - cancelContext longtext - ) - - - create table ${detailTable} - ( - id bigint comment 'ID', - create_time datetime, - update_time datetime, - creator bigint, - delete_type int, - tenant_key varchar(10), - uuid varchar(36), - tableName varchar(200), - fieldName char(200), - newValue longtext, - oldValue longtext, - fieldDesc varchar(200), - showorder int default 0 - ) - - - - - - - ${createElogSql} - - \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 3c30540a4..f53e0ddeb 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -5,6 +5,9 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SalaryItemBiz; import com.engine.salary.biz.SysSalaryItemBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.entity.salaryformula.po.FormulaPO; import com.engine.salary.entity.salaryformula.po.FormulaVar; import com.engine.salary.entity.salaryitem.bo.SalaryItemBO; @@ -17,6 +20,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; import com.engine.salary.entity.salarysob.po.SalarySobItemPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.SalarySystemTypeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; import com.engine.salary.enums.sicategory.SharedTypeEnum; @@ -76,6 +80,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService return ServiceUtil.getService(SalarySobServiceImpl.class, user); } + private LoggerTemplate salaryItemLoggerTemplate = SalaryElogConfig.salaryItemLoggerTemplate(); + private SysSalaryItemBiz sysSalaryItemBiz = new SysSalaryItemBiz(); // @Autowired @@ -202,15 +208,15 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService } SalaryItemPO salaryItemPO = SalaryItemBO.convert2SalaryItemPO(saveParam, (long) user.getUID()); salaryItemBiz.insert(salaryItemPO); - // todo 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); -// loggerContext.setTargetName(salaryItemPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目") + ": " + salaryItemPO.getName()); -// loggerContext.setNewValues(salaryItemPO); -// salaryItemLoggerTemplate.write(loggerContext); + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); + loggerContext.setTargetName(salaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目") + ": " + salaryItemPO.getName()); + loggerContext.setNewValues(salaryItemPO); + salaryItemLoggerTemplate.write(loggerContext); } @Override @@ -284,15 +290,15 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); -// loggerContext.setTargetName(newSalaryItemPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目") + ": " + newSalaryItemPO.getName()); -// loggerContext.setOldValues(salaryItemPO); -// loggerContext.setNewValues(newSalaryItemPO); -// salaryItemLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); + loggerContext.setTargetName(newSalaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目") + ": " + newSalaryItemPO.getName()); + loggerContext.setOldValues(salaryItemPO); + loggerContext.setNewValues(newSalaryItemPO); + salaryItemLoggerTemplate.write(loggerContext); } private void changeName(SalaryItemPO salaryItemPO, String oldName, String newName, String itemPrefix, String fieldNamePrefix) { From bd0edcf8e23e04d7a0ea124a8aaffe0f005acaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 22 Dec 2023 14:50:16 +0800 Subject: [PATCH 023/169] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/config/SalaryElogConfig.java | 760 +++++++++--------- .../engine/salary/elog/dto/LoggerContext.java | 11 + .../engine/salary/elog/util/ElogUtils.java | 116 +-- .../salary/elog/util/LoggerTemplate.java | 15 +- .../mapper/elog/LocalElogAopDaoMapper.xml | 4 +- .../service/impl/SalaryItemServiceImpl.java | 2 + .../engine/salary/util/ResponseResult.java | 15 +- .../salary/web/SalaryItemController.java | 8 +- 8 files changed, 416 insertions(+), 515 deletions(-) diff --git a/src/com/engine/salary/config/SalaryElogConfig.java b/src/com/engine/salary/config/SalaryElogConfig.java index 006e75a94..7156eeff4 100644 --- a/src/com/engine/salary/config/SalaryElogConfig.java +++ b/src/com/engine/salary/config/SalaryElogConfig.java @@ -4,23 +4,23 @@ import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.elog.util.LoggerTemplateBuilder; /** - * @description: elog日志 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 10/22/21 10:27 AM - * @version:v1.0 - */ + * elog日志 + *

Copyright: Copyright (c) 2023

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryElogConfig { -// /** -// * 个税税率表 -// * -// * @return -// */ -// @Bean("taxRateLoggerTemplate") -// public LoggerTemplate taxRateLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "taxrate"); -// } + /** + * 个税税率表 + * + * @return + */ + public static LoggerTemplate taxRateLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "taxrate"); + } /** * 薪资项目 @@ -28,391 +28,351 @@ public class SalaryElogConfig { * @return */ public static LoggerTemplate salaryItemLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "adc"); + return LoggerTemplateBuilder.build("hrsa", "salaryitem"); } -// /** -// * 个税扣缴义务人 -// * -// * @return -// */ -// @Bean("taxAgentLoggerTemplate") -// public LoggerTemplate taxAgentLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "taxagent"); -// } -// -// @Bean("siCategoryLoggerTemplate") -// public LoggerTemplate siCategoryLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "siCategory"); -// } -// -// @Bean("siSchemeLoggerTemplate") -// public LoggerTemplate siSchemeLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "siScheme"); -// } -// -// @Bean("totalSchemeLoggerTemplate") -// public LoggerTemplate totalSchemeLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "totalScheme"); -// } -// -// /** -// * 累计情况 -// * -// * @return -// */ -// @Bean("addUpSituationLoggerTemplate") -// public LoggerTemplate addUpSituationLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "addupsituation"); -// } -// -// /** -// * 累计专项附加扣除 -// * -// * @return -// */ -// @Bean("addUpDeductionLoggerTemplate") -// public LoggerTemplate addUpDeductionLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "addupdeduction"); -// } -// -// /** -// * 其他免税扣除 -// * -// * @return -// */ -// @Bean("otherDeductionLoggerTemplate") -// public LoggerTemplate otherDeductionLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "otherdeduction"); -// } -// -// /** -// * 减税 -// * -// * @return -// */ -// @Bean("derateDeductionLoggerTemplate") -// public LoggerTemplate derateDeductionLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "deratededuction"); -// } -// -// /** -// * 税延养老保险 -// * -// * @return -// */ -// @Bean("endowmentInsuranceLoggerTemplate") -// public LoggerTemplate endowmentInsuranceLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "endowmentinsurance"); -// } -// -// /** -// * 税延养老保险 -// * -// * @return -// */ -// @Bean("freeIncomeLoggerTemplate") -// public LoggerTemplate freeIncomeLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "freeincome"); -// } -// -// /** -// * 捐赠免税 -// * -// * @return -// */ -// @Bean("grantDonationLoggerTemplate") -// public LoggerTemplate grantDonationLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "grantdonation"); -// } -// -// /** -// * 捐赠免税 -// * -// * @return -// */ -// @Bean("healthInsuranceLoggerTemplate") -// public LoggerTemplate healthInsuranceLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "healthinsurance"); -// } -// -// /** -// * 其他免税扣除 -// * -// * @return -// */ -// @Bean("otherDerateDeductionLoggerTemplate") -// public LoggerTemplate otherDerateDeductionLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "otherderatededuction"); -// } -// -// /** -// * 考勤引用 -// * -// * @return -// */ -// @Bean("attendQuoteLoggerTemplate") -// public LoggerTemplate attendQuoteLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "attendquote"); -// } -// -// /** -// * 考勤引用字段管理 -// * -// * @return -// */ -// @Bean("attendQuoteFieldLoggerTemplate") -// public LoggerTemplate attendQuoteFieldLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "attendfield"); -// } -// -// /** -// * 考勤引用字段设置 -// * -// * @return -// */ -// @Bean("attendQuoteFieldSettingLoggerTemplate") -// public LoggerTemplate attendQuoteFieldSettingLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "attendfieldset"); -// } -// -// /** -// * 薪资账套 -// * -// * @return -// */ -// @Bean("salarySobLoggerTemplate") -// public LoggerTemplate salarySobLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "salarysob"); -// } -// -// /** -// * 薪资核算 -// * -// * @return -// */ -// @Bean("salaryAcctRecordLoggerTemplate") -// public LoggerTemplate salaryAcctRecordLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "acctrecord"); -// } -// -// /** -// * 个税申报表 -// * -// * @return -// */ -// @Bean("taxDeclarationLoggerTemplate") -// public LoggerTemplate taxDeclarationLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "taxdecla"); -// } -// -// /** -// * 福利档案 -// * -// * @return -// */ -// @Bean("siArchivesLoggerTemplate") -// public LoggerTemplate siArchivesLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "siarchives"); -// } -// -// /** -// * 社保规则 -// */ -// @Bean("archiveRuleLoggerTemplate") -// public LoggerTemplate archiveRuleLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "archiverule"); -// } -// -// /** -// * 代缴机构 -// * -// * @return -// */ -// @Bean("paymentAgencyLoggerTemplate") -// public LoggerTemplate paymentAgencyLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "paymentagency"); -// } -// -// /** -// * 福利核算 -// * -// * @return -// */ -// @Bean("siAccountLoggerTemplate") -// public LoggerTemplate siAccountLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "siaccount"); -// } -// -// /** -// * 工资单模板 -// * -// * @return -// */ -// @Bean("salaryTemplateLoggerTemplate") -// public LoggerTemplate salaryTemplateLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "salarytemplate"); -// } -// -// /** -// * 工资单发放 -// * -// * @return -// */ -// @Bean("salarySendLoggerTemplate") -// public LoggerTemplate salarySendLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "salarysend"); -// } -// -// /** -// * 外部人员 -// * -// * @return -// */ -// @Bean("extEmployeeLoggerTemplate") -// public LoggerTemplate extEmployeeLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "extemployee"); -// } -// -// /** -// * 薪资档案 -// * -// * @return -// */ -// @Bean("salaryArchiveLoggerTemplate") -// public LoggerTemplate salaryArchiveLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "salaryarchive"); -// } -// -// /** -// * 薪资档案-字段 -// * -// * @return -// */ -// @Bean("salaryArchiveFieldLoggerTemplate") -// public LoggerTemplate salaryArchiveFieldLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "salarcfield"); -// } -// -// /** -// * 薪资档案-薪资项目调整 -// * -// * @return -// */ -// @Bean("salaryArchiveItemAdjustLoggerTemplate") -// public LoggerTemplate salaryArchiveItemAdjustLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "salarcitemadj"); -// } -// -// /** -// * 薪资档案-批量调薪 -// * -// * @return -// */ -// @Bean("salaryArchiveBatchAdjustLoggerTemplate") -// public LoggerTemplate salaryArchiveBatchAdjustLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "salarcbatadj"); -// } -// -// /** -// * 自定义业务数据设置 -// * -// * @return -// */ -// @Bean("customDataSetLoggerTemplate") -// public LoggerTemplate customDataSetLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "customdataset"); -// } -// -// /** -// * 自定义业务数据 -// * -// * @return -// */ -// @Bean("customDataLoggerTemplate") -// public LoggerTemplate customDataLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "customdata"); -// } -// -// -// /** -// * 人员报送 -// * -// * @return -// */ -// @Bean("employeeDeclareLoggerTemplate") -// public LoggerTemplate employeeDeclareLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "empdeclare"); -// } -// -// /** -// * 单位扣款账号 -// * -// * @return -// */ -// @Bean("withholdAccountLoggerTemplate") -// public LoggerTemplate withholdAccountLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "whaccount"); -// } -// -// /** -// * 银行报盘 -// * -// * @return -// */ -// @Bean("bankOfferLoggerTemplate") -// public LoggerTemplate bankOfferLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "bankoffer"); -// } -// -// /** -// * 银行报盘模板 -// * -// * @return -// */ -// @Bean("bankOfferTemplateLoggerTemplate") -// public LoggerTemplate bankOfferTemplateLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "botemplate"); -// } -// -// /** -// * 薪酬体系标准（岗薪制） -// * -// * @return -// */ -// @Bean("postSalaryLoggerTemplate") -// public LoggerTemplate postSalaryLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "postsalary"); -// } -// -// /** -// * 银行报盘模板 -// * -// * @return -// */ -// @Bean("taxFreeDetailLoggerTemplate") -// public LoggerTemplate taxFreeDetailLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "taxfreedetail"); -// } -// -// /** -// * 最优年终奖计税方案 -// * -// * @return -// */ -// @Bean("annualBonusPlanLoggerTemplate") -// public LoggerTemplate annualBonusPlanLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "annualplan"); -// } -// -// /** -// * 最优年终奖计税方案-累计情况 -// * 最优年终奖计税方案-优化方案详情 -// * -// * @return -// */ -// @Bean("annualBonusLoggerTemplate") -// public LoggerTemplate annualBonusLoggerTemplate() { -// return LoggerTemplateBuilder.build("hrsa", "annualbonus"); -// } + /** + * 个税扣缴义务人 + * + * @return + */ + public static LoggerTemplate taxAgentLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "taxagent"); + } + + public static LoggerTemplate siCategoryLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "siCategory"); + } + + public static LoggerTemplate siSchemeLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "siScheme"); + } + + public static LoggerTemplate totalSchemeLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "totalScheme"); + } + + /** + * 累计情况 + * + * @return + */ + public static LoggerTemplate addUpSituationLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "addupsituation"); + } + + /** + * 累计专项附加扣除 + * + * @return + */ + public static LoggerTemplate addUpDeductionLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "addupdeduction"); + } + + /** + * 其他免税扣除 + * + * @return + */ + public static LoggerTemplate otherDeductionLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "otherdeduction"); + } + + /** + * 减税 + * + * @return + */ + public static LoggerTemplate derateDeductionLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "deratededuction"); + } + + /** + * 税延养老保险 + * + * @return + */ + public static LoggerTemplate endowmentInsuranceLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "endowmentinsurance"); + } + + /** + * 税延养老保险 + * + * @return + */ + public static LoggerTemplate freeIncomeLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "freeincome"); + } + + /** + * 捐赠免税 + * + * @return + */ + public static LoggerTemplate grantDonationLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "grantdonation"); + } + + /** + * 捐赠免税 + * + * @return + */ + public static LoggerTemplate healthInsuranceLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "healthinsurance"); + } + + /** + * 其他免税扣除 + * + * @return + */ + public static LoggerTemplate otherDerateDeductionLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "otherderatededuction"); + } + + /** + * 考勤引用 + * + * @return + */ + public static LoggerTemplate attendQuoteLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "attendquote"); + } + + /** + * 考勤引用字段管理 + * + * @return + */ + public static LoggerTemplate attendQuoteFieldLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "attendfield"); + } + + /** + * 考勤引用字段设置 + * + * @return + */ + public static LoggerTemplate attendQuoteFieldSettingLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "attendfieldset"); + } + + /** + * 薪资账套 + * + * @return + */ + public static LoggerTemplate salarySobLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "salarysob"); + } + + /** + * 薪资核算 + * + * @return + */ + public static LoggerTemplate salaryAcctRecordLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "acctrecord"); + } + + /** + * 个税申报表 + * + * @return + */ + public static LoggerTemplate taxDeclarationLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "taxdecla"); + } + + /** + * 福利档案 + * + * @return + */ + public static LoggerTemplate siArchivesLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "siarchives"); + } + + /** + * 社保规则 + */ + public static LoggerTemplate archiveRuleLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "archiverule"); + } + + /** + * 代缴机构 + * + * @return + */ + public static LoggerTemplate paymentAgencyLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "paymentagency"); + } + + /** + * 福利核算 + * + * @return + */ + public static LoggerTemplate siAccountLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "siaccount"); + } + + /** + * 工资单模板 + * + * @return + */ + public static LoggerTemplate salaryTemplateLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "salarytemplate"); + } + + /** + * 工资单发放 + * + * @return + */ + public static LoggerTemplate salarySendLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "salarysend"); + } + + /** + * 外部人员 + * + * @return + */ + public static LoggerTemplate extEmployeeLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "extemployee"); + } + + /** + * 薪资档案 + * + * @return + */ + public static LoggerTemplate salaryArchiveLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "salaryarchive"); + } + + /** + * 薪资档案-字段 + * + * @return + */ + public static LoggerTemplate salaryArchiveFieldLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "salarcfield"); + } + + /** + * 薪资档案-薪资项目调整 + * + * @return + */ + public static LoggerTemplate salaryArchiveItemAdjustLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "salarcitemadj"); + } + + /** + * 薪资档案-批量调薪 + * + * @return + */ + public static LoggerTemplate salaryArchiveBatchAdjustLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "salarcbatadj"); + } + + /** + * 自定义业务数据设置 + * + * @return + */ + public static LoggerTemplate customDataSetLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "customdataset"); + } + + /** + * 自定义业务数据 + * + * @return + */ + public static LoggerTemplate customDataLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "customdata"); + } + + + /** + * 人员报送 + * + * @return + */ + public static LoggerTemplate employeeDeclareLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "empdeclare"); + } + + /** + * 单位扣款账号 + * + * @return + */ + public static LoggerTemplate withholdAccountLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "whaccount"); + } + + /** + * 银行报盘 + * + * @return + */ + public static LoggerTemplate bankOfferLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "bankoffer"); + } + + /** + * 银行报盘模板 + * + * @return + */ + public static LoggerTemplate bankOfferTemplateLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "botemplate"); + } + + /** + * 薪酬体系标准（岗薪制） + * + * @return + */ + public static LoggerTemplate postSalaryLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "postsalary"); + } + + /** + * 银行报盘模板 + * + * @return + */ + public static LoggerTemplate taxFreeDetailLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "taxfreedetail"); + } + + /** + * 最优年终奖计税方案 + * + * @return + */ + public static LoggerTemplate annualBonusPlanLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "annualplan"); + } + + /** + * 最优年终奖计税方案-累计情况 + * 最优年终奖计税方案-优化方案详情 + * + * @return + */ + public static LoggerTemplate annualBonusLoggerTemplate() { + return LoggerTemplateBuilder.build("hrsa", "annualbonus"); + } } diff --git a/src/com/engine/salary/elog/dto/LoggerContext.java b/src/com/engine/salary/elog/dto/LoggerContext.java index 8c4b3aa0e..5b00005f0 100644 --- a/src/com/engine/salary/elog/dto/LoggerContext.java +++ b/src/com/engine/salary/elog/dto/LoggerContext.java @@ -7,6 +7,7 @@ import com.engine.salary.elog.enums.ElogConsts; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; +import weaver.hrm.User; import java.io.Serializable; import java.util.ArrayList; @@ -26,6 +27,8 @@ public class LoggerContext implements Serializable { private static final long serialVersionUID = 15869325700230992L; + private User user; + @ElogField(comment = "ID", dataType = DataTypeEnum.BIGINT, isKey = true) @ApiModelProperty("日志ID") private long id; @@ -263,6 +266,14 @@ public class LoggerContext implements Serializable { private List clobFieldList; + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + public List getClobFieldList() { return clobFieldList; } diff --git a/src/com/engine/salary/elog/util/ElogUtils.java b/src/com/engine/salary/elog/util/ElogUtils.java index 5e792fbdd..077593ee6 100644 --- a/src/com/engine/salary/elog/util/ElogUtils.java +++ b/src/com/engine/salary/elog/util/ElogUtils.java @@ -10,6 +10,7 @@ import org.apache.dubbo.common.utils.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import weaver.hrm.User; import javax.servlet.http.HttpServletRequest; import java.io.ByteArrayInputStream; @@ -305,33 +306,6 @@ public class ElogUtils { } } - public static boolean isLongValue(String v) { - try { - Long.parseLong(v); - } catch (Exception e) { - return false; - } - return true; - } - - public static int currentLanguage() { -// String employeeId = getEmployeeId(); -// if (employeeId != null) { -// return I18nLanguageUtil.getLangId(Long.parseLong(employeeId)); -// } else { -// return 7; -// } - return 7; - } - -// /** -// * 获取request请求 -// * -// * @return -// */ -// public static HttpServletRequest getRequest() { -// return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); -// } /** * 将对象转换程字符串 @@ -409,80 +383,32 @@ public class ElogUtils { } } -// public static String getTenantKey() { -// -// String tenantKey = TenantRpcContext.getTenantKey(); -// if (StringUtils.isNotBlank(tenantKey)) { -// return tenantKey; -// } -// -// return ""; -// } -// -// public static String getEmployeeId() { -// -// String employeeId = TenantRpcContext.getEmployeeId(); -// if (StringUtils.isNotBlank(employeeId)) { -// return employeeId; -// } -// -// return ""; -// } - - public static String getUserName() { - -// String employeeId = getEmployeeId(); -// if (StringUtils.isNotEmpty(employeeId)) { -// HrmEmployeeComInfo simpleEmployee = null; -// try { -// ComInfoCache bean = SpringUtils.getBean(ComInfoCache.class); -// if (bean != null) { -// simpleEmployee = bean.getCacheById(HrmEmployeeComInfo.class, ElogUtils.getLongValue(employeeId)); -// } -// } catch (Exception e) { -// logger.error("Exception", e); -// } -// if (simpleEmployee != null) { -// if (StringUtils.isNotBlank(simpleEmployee.getUsername())) { -// return simpleEmployee.getUsername(); -// } -// } -// } - - - return ""; - } - /** * 获取rpc信息（客户端ip和来源设备） * * @param context */ public static void initRpcInfo(LoggerContext context) { -// String device = ""; -// String clientIp = ""; -// String traceId = ""; -// try { -// device = RpcContext.getContext().getAttachment(EteamsConstant.DEVICE); -// clientIp = RpcContext.getContext().getAttachment(EteamsConstant.CLIENT_IP); -// traceId = RpcContext.getContext().getAttachment(ApmConstant.TRACE_ID); -//// logger.info("rpc调用获取到 device:{},clientIp:{},traceId:{}", device, clientIp, traceId); -// } catch (Exception e) { -// logger.error("Exception", e); -// } -// if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { -// context.setDevice(device); -// } -// if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { -// context.setFromTerminal(getFromTerminal(device)); -// } -// -// if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { -// context.setClientIp(clientIp); -// } -// if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { -// context.setBelongMainId(traceId); -// } + User user = context.getUser(); + if(user == null){ + return; + } + String device = user.getLogintype(); + String clientIp = user.getLoginip(); + String traceId = ""; + if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { + context.setDevice(device); + } + if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { + context.setFromTerminal(getFromTerminal(device)); + } + + if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { + context.setClientIp(clientIp); + } + if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { + context.setBelongMainId(traceId); + } } public static String getFromTerminal(String device) { diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java index c5584bc62..f3fca954a 100644 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.dubbo.common.utils.AnnotationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import weaver.hrm.User; import java.lang.reflect.Field; import java.util.*; @@ -240,17 +241,12 @@ public class LoggerTemplate { } context.setTempParams(null); - //User user = UserContext.getCurrentUser(); - //if(user != null) { - // 通过统一登录获取 - String employeeId = "92"; + String employeeId = Optional.ofNullable(context.getUser()).map(User::getUID).orElse(0).toString(); String tenantKey = SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; - String userName = ElogUtils.getUserName(); - //String userName = TenantRpcContext.getEmployeeId(); + String userName = Optional.ofNullable(context.getUser()).map(User::getUsername).orElse("").toString(); if (StringUtils.isEmpty(context.getOperator()) && StringUtils.isNotEmpty(employeeId)) { context.setOperator(employeeId + ""); } - if (StringUtils.isEmpty(context.getTenant_key()) && StringUtils.isNotEmpty(tenantKey)) { context.setTenant_key(tenantKey); } @@ -266,16 +262,17 @@ public class LoggerTemplate { context.setTargetId("-1"); } -// RequestAttributes requestAttributes = WeaverRequestContextHolder.getRequestAttributesSafely(); +// RequestAttributes requestAttributes = SalaryContext.get().getRequestAttributesSafely(); // if ((requestAttributes instanceof ServletRequestAttributes)) { // HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); -// ElogUtils.initRequestInfo(request, context);z +// ElogUtils.initRequestInfo(request, context); // } else { // if (StringUtils.isEmpty(context.getRequestUrl())) { // context.setRequestUrl("非http请求"); // } // ElogUtils.initRpcInfo(context); // } + ElogUtils.initRpcInfo(context); List changeBeans = context.getChangeValues(); diff --git a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml index 4bd8ea6d2..41e8003ef 100644 --- a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml +++ b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml @@ -74,7 +74,7 @@ #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, #{detailContext.fieldNameLabelId} - , #{detailContext.create_time}, #{detailContext.update_time}, #{logContent.delete_type}) + , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}) @@ -122,7 +122,7 @@ #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, #{detailContext.fieldNameLabelId} - , #{detailContext.create_time}, #{detailContext.update_time}, #{logContent.delete_type} + , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type} FROM DUAL diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index f53e0ddeb..1eebda42e 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -210,6 +210,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService salaryItemBiz.insert(salaryItemPO); // 记录日志 LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); loggerContext.setTargetName(salaryItemPO.getName()); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); @@ -291,6 +292,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService // 记录日志 LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); loggerContext.setTargetName(newSalaryItemPO.getName()); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); diff --git a/src/com/engine/salary/util/ResponseResult.java b/src/com/engine/salary/util/ResponseResult.java index 7755bc673..2036fd1a2 100644 --- a/src/com/engine/salary/util/ResponseResult.java +++ b/src/com/engine/salary/util/ResponseResult.java @@ -3,9 +3,8 @@ package com.engine.salary.util; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.engine.common.service.HrmCommonService; -import com.engine.common.service.impl.HrmCommonServiceImpl; import com.engine.core.exception.ECException; +import com.engine.salary.common.SalaryContext; import com.engine.salary.exception.ExceptionUtil; import com.engine.salary.exception.SalaryRunTimeException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -14,6 +13,8 @@ import lombok.extern.slf4j.Slf4j; import weaver.general.BaseBean; import weaver.hrm.User; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; @@ -35,14 +36,20 @@ public class ResponseResult { private final User user; - private final HrmCommonService hrmCommonService = new HrmCommonServiceImpl(); - private final BaseBean baseBean = new BaseBean(); private final Boolean isLog = "true".equals(baseBean.getPropValue("hrmSalary", "log")); public ResponseResult(User user) { this.user = user; + SalaryContext.get().setValue("user", user); + } + + public ResponseResult(HttpServletRequest request, HttpServletResponse response, User user) { + this.user = user; + SalaryContext.get().setValue("user", user); + SalaryContext.get().setValue("request", request); + SalaryContext.get().setValue("response", response); } diff --git a/src/com/engine/salary/web/SalaryItemController.java b/src/com/engine/salary/web/SalaryItemController.java index 39131b9f4..cae184b9b 100644 --- a/src/com/engine/salary/web/SalaryItemController.java +++ b/src/com/engine/salary/web/SalaryItemController.java @@ -1,7 +1,6 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; -import com.engine.salary.common.SalaryContext; import com.engine.salary.component.WeaFormOption; import com.engine.salary.entity.salaryitem.dto.SalaryItemFormDTO; import com.engine.salary.entity.salaryitem.dto.SalaryItemListDTO; @@ -41,7 +40,6 @@ import java.util.Map; public class SalaryItemController { private SalaryItemWrapper getSalaryItemWrapper(User user) { - SalaryContext.get().setValue("user",user); return ServiceUtil.getService(SalaryItemWrapper.class, user); } @@ -60,7 +58,7 @@ public class SalaryItemController { @Produces(MediaType.APPLICATION_JSON) public String listSalaryItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryItemSearchParam searchParam) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getSalaryItemWrapper(user)::listPage, searchParam); + return new ResponseResult>(request, response, user).run(getSalaryItemWrapper(user)::listPage, searchParam); } @@ -168,9 +166,9 @@ public class SalaryItemController { public String saveSalaryItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryItemSaveParam saveParam) { User user = HrmUserVarify.getUser(request, response); if (saveParam.getId() == null || saveParam.getId() <= 0) { - return new ResponseResult(user).run(getSalaryItemWrapper(user)::save, saveParam); + return new ResponseResult(request, response, user).run(getSalaryItemWrapper(user)::save, saveParam); } else { - return new ResponseResult(user).run(getSalaryItemWrapper(user)::update, saveParam); + return new ResponseResult(request, response, user).run(getSalaryItemWrapper(user)::update, saveParam); } } From 7a2332474494a760122fa2bdbefe6d7b703fac90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 22 Dec 2023 14:52:09 +0800 Subject: [PATCH 024/169] =?UTF-8?q?=E4=BF=AE=E6=94=B9elog=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=A1=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml index c345b7aba..a0410827b 100644 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml @@ -3,10 +3,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into elog_version (id, maintable, version) values (#{id},#{mainTable},#{version}) + insert into hrsa_elog_version (id, maintable, version) values (#{id},#{mainTable},#{version}) create table ${mainTable} From ea8d51c493ccad7f4f9db32ffe3a7c5315e1830d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 22 Dec 2023 16:36:11 +0800 Subject: [PATCH 025/169] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryItemServiceImpl.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 1eebda42e..0110994fa 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -354,17 +354,18 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService // 删除薪资项目 ids = SalaryEntityUtil.properties(salaryItemPOS, SalaryItemPO::getId); salaryItemBiz.deleteByIds(ids); - //todo 记录删除日志 -// salaryItemPOS.forEach(salaryItemPO -> { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); -// loggerContext.setTargetName(salaryItemPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目") + ": " + salaryItemPO.getName()); -// loggerContext.setOldValues(salaryItemPO); -// salaryItemLoggerTemplate.write(loggerContext); -// }); + // 记录删除日志 + salaryItemPOS.forEach(salaryItemPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); + loggerContext.setTargetName(salaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目") + ": " + salaryItemPO.getName()); + loggerContext.setOldValues(salaryItemPO); + salaryItemLoggerTemplate.write(loggerContext); + }); } From 8b5703c8948f8370cfbfeedd8f11183547d7de8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 25 Dec 2023 09:36:23 +0800 Subject: [PATCH 026/169] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/salary/web/LoggerTableController.java | 15 + .../salary/elog/annotation/HandleElog.java | 17 + src/com/engine/salary/elog/dto/ElogBean.java | 116 + .../salary/elog/dto/FilterConditionDto.java | 91 + .../engine/salary/elog/dto/ShowColumsDto.java | 105 + .../elog/service/ILoggerTableService.java | 39 + .../elog/service/impl/LoggerTableService.java | 1972 +++++++++++++++++ .../salary/elog/util/ElogServiceUtils.java | 92 + .../elog/util/ElogSeviceSwitchUtils.java | 1394 ++++++++++++ .../salary/elog/util/ElogSeviceUtils.java | 547 +++++ .../elog/web/LoggerTableController.java | 178 ++ 11 files changed, 4566 insertions(+) create mode 100644 src/com/api/salary/web/LoggerTableController.java create mode 100644 src/com/engine/salary/elog/annotation/HandleElog.java create mode 100644 src/com/engine/salary/elog/dto/ElogBean.java create mode 100644 src/com/engine/salary/elog/dto/FilterConditionDto.java create mode 100644 src/com/engine/salary/elog/dto/ShowColumsDto.java create mode 100644 src/com/engine/salary/elog/service/ILoggerTableService.java create mode 100644 src/com/engine/salary/elog/service/impl/LoggerTableService.java create mode 100644 src/com/engine/salary/elog/util/ElogServiceUtils.java create mode 100644 src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java create mode 100644 src/com/engine/salary/elog/util/ElogSeviceUtils.java create mode 100644 src/com/engine/salary/elog/web/LoggerTableController.java diff --git a/src/com/api/salary/web/LoggerTableController.java b/src/com/api/salary/web/LoggerTableController.java new file mode 100644 index 000000000..eb33772ce --- /dev/null +++ b/src/com/api/salary/web/LoggerTableController.java @@ -0,0 +1,15 @@ +package com.api.salary.web; + +import javax.ws.rs.Path; + +/** + * 日志列表公共接口暴漏 + *

Copyright: Copyright (c) 2023

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +@Path("/bs/hrmsalary/elog") +public class LoggerTableController { +} diff --git a/src/com/engine/salary/elog/annotation/HandleElog.java b/src/com/engine/salary/elog/annotation/HandleElog.java new file mode 100644 index 000000000..387666b18 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/HandleElog.java @@ -0,0 +1,17 @@ +package com.engine.salary.elog.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface HandleElog { + + String modulename() default ""; + + String functionname() default ""; + + String service() default ""; +} diff --git a/src/com/engine/salary/elog/dto/ElogBean.java b/src/com/engine/salary/elog/dto/ElogBean.java new file mode 100644 index 000000000..d4239b9a7 --- /dev/null +++ b/src/com/engine/salary/elog/dto/ElogBean.java @@ -0,0 +1,116 @@ +package com.engine.salary.elog.dto; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Date: 2022/5/2 21:51 + * @Author: deli.xu + * @Description: 日志中心bean + **/ +public class ElogBean implements Serializable { + + + private static final long serialVersionUID = 5357552376749564256L; + private String module; + private String function; + private String pageNum; + private String pageSize; + private String dataset; + private String searchMap; + private List showColumns = new ArrayList<>(); + private List filterConditionDtos = new ArrayList<>(); + private String downloadSize; + private String transMethod; + private Map authParamsJson; + + public String getModule() { + return module; + } + + public void setModule(String module) { + this.module = module; + } + + public String getFunction() { + return function; + } + + public void setFunction(String function) { + this.function = function; + } + + public String getPageNum() { + return pageNum; + } + + public void setPageNum(String pageNum) { + this.pageNum = pageNum; + } + + public String getPageSize() { + return pageSize; + } + + public void setPageSize(String pageSize) { + this.pageSize = pageSize; + } + + public String getDataset() { + return dataset; + } + + public void setDataset(String dataset) { + this.dataset = dataset; + } + + public String getSearchMap() { + return searchMap; + } + + public void setSearchMap(String searchMap) { + this.searchMap = searchMap; + } + + public List getShowColumns() { + return showColumns; + } + + public void setShowColumns(List showColumns) { + this.showColumns = showColumns; + } + + public List getFilterConditionDtos() { + return filterConditionDtos; + } + + public void setFilterConditionDtos(List filterConditionDtos) { + this.filterConditionDtos = filterConditionDtos; + } + + public String getDownloadSize() { + return downloadSize; + } + + public void setDownloadSize(String downloadSize) { + this.downloadSize = downloadSize; + } + + public String getTransMethod() { + return transMethod; + } + + public void setTransMethod(String transMethod) { + this.transMethod = transMethod; + } + + public Map getAuthParamsJson() { + return authParamsJson; + } + + public void setAuthParamsJson(Map authParamsJson) { + this.authParamsJson = authParamsJson; + } +} diff --git a/src/com/engine/salary/elog/dto/FilterConditionDto.java b/src/com/engine/salary/elog/dto/FilterConditionDto.java new file mode 100644 index 000000000..d276b1b27 --- /dev/null +++ b/src/com/engine/salary/elog/dto/FilterConditionDto.java @@ -0,0 +1,91 @@ +package com.engine.salary.elog.dto; + +import java.io.Serializable; + +/** + * @date: 2021/5/25 17:23 + * @author: deli.xu + * @description: + */ +public class FilterConditionDto implements Serializable { + + private static final long serialVersionUID = -3399942468474767859L; + + /** + * 列名 + */ + private String columIndex; + /** + * 值 + */ + private String value; + + /** + * 过滤类型 + */ + private String type; + + /** + * 模糊搜索 + */ + private Like like; + + /** + * 关联条件 + */ + private String connectCondition; + + /** + * sql条件 + */ + private String sql; + + + public String getColumIndex() { + return columIndex; + } + + public void setColumIndex(String columIndex) { + this.columIndex = columIndex; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Like getLike() { + return like; + } + + public void setLike(Like like) { + this.like = like; + } + + public String getConnectCondition() { + return connectCondition; + } + + public void setConnectCondition(String connectCondition) { + this.connectCondition = connectCondition; + } + + public String getSql() { + return sql; + } + + public void setSql(String sql) { + this.sql = sql; + } +} diff --git a/src/com/engine/salary/elog/dto/ShowColumsDto.java b/src/com/engine/salary/elog/dto/ShowColumsDto.java new file mode 100644 index 000000000..828474be5 --- /dev/null +++ b/src/com/engine/salary/elog/dto/ShowColumsDto.java @@ -0,0 +1,105 @@ +package com.engine.salary.elog.dto; + + +import java.io.Serializable; + +/** + * @date: 2021/5/11 18:46 + * @author: deli.xu + * @description: 显示列对象 + */ +public class ShowColumsDto implements Serializable { + + private static final long serialVersionUID = 4650449925605408753L; + + /** + * 列名 + */ + private String columName; + /** + * 列别名 + */ + private String aliasColumName; + + /** + * 列名index + */ + private String columIndex; + + /** + * 是否隐藏 默认显示 + */ + private boolean isHide = false; + + /** + * 宽度 + */ + private String width; + + /** + * 是否转多语言 + */ + private boolean isTransfLanguage = false; + + /** + * 是否换行 + * @param width + */ + private boolean newLine = false; + + public void setWidth(String width){ + this.width =width; + } + + public String getWidth(){ + return width; + } + public String getColumName() { + return columName; + } + + public void setColumName(String columName) { + this.columName = columName; + } + + public String getAliasColumName() { + return aliasColumName; + } + + public void setAliasColumName(String aliasColumName) { + this.aliasColumName = aliasColumName; + } + + public boolean isHide() { + return isHide; + } + + public void setHide(boolean hide) { + isHide = hide; + } + + public String getColumIndex() { + return columIndex; + } + + public void setColumIndex(String columIndex) { + this.columIndex = columIndex; + } + + public boolean isTransfLanguage() { + return isTransfLanguage; + } + + public boolean isNewLine() { + return newLine; + } + + public void setNewLine(boolean newLine) { + this.newLine = newLine; + } + + public void setTransfLanguage(boolean transfLanguage) { + + isTransfLanguage = transfLanguage; + } +} diff --git a/src/com/engine/salary/elog/service/ILoggerTableService.java b/src/com/engine/salary/elog/service/ILoggerTableService.java new file mode 100644 index 000000000..00c5b6327 --- /dev/null +++ b/src/com/engine/salary/elog/service/ILoggerTableService.java @@ -0,0 +1,39 @@ +package com.engine.salary.elog.service; + +import com.weaver.common.batch.entity.BatchDocumentMessage; +import com.weaver.common.component.table.WeaTable; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +public interface ILoggerTableService { + WeaTable queryLogs(String data); + + WeaTable queryLogsPapi(String data, HttpServletRequest request); + + List getDetailChanges(String module, String function, String mainid,String transMethod); + + List getDetailChangesPapi(String module, String function, String mainid, String transMethod, HttpServletRequest request); + + List queryLogList(String module, String function, String current, String pageSize, String condition); + + List queryCardLogList(String data); + + Map countLog(String module, String function); + + List queryDetailLogList(String module, String function, String current, String pageSize, String condition, String mainId); + + Map countDestailLog(String module, String function, String mainId); + + WeaTable queryElogTraceInfo(String traceId, String module, String function, Integer currentPage, Integer pageSize,String traceTransMethod); + + List queryLogInfoByCustom(String module, String function, String field, String value, boolean isDetail); + + List queryLogInfoByCustom(String module, String function, String field, String value); + + BatchDocumentMessage downloadLog(String data); + + WeaTable getDetailChangePages(String module, String function, String mainid, String detailTransMethod, String current, String pageSize); + +} diff --git a/src/com/engine/salary/elog/service/impl/LoggerTableService.java b/src/com/engine/salary/elog/service/impl/LoggerTableService.java new file mode 100644 index 000000000..bb5dfc812 --- /dev/null +++ b/src/com/engine/salary/elog/service/impl/LoggerTableService.java @@ -0,0 +1,1972 @@ +package com.engine.salary.elog.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.engine.salary.elog.dto.ElogBean; +import com.engine.salary.elog.dto.FilterConditionDto; +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.dto.ShowColumsDto; +import com.engine.salary.elog.service.ILoggerTableService; +import com.engine.salary.elog.util.ElogServiceUtils; +import com.engine.salary.elog.util.ElogSeviceUtils; +import com.engine.salary.mapper.elog.LocalElogDaoMapper; +import com.weaver.common.batch.consts.FileType; +import com.weaver.common.batch.consts.HandlerFileMethod; +import com.weaver.common.batch.entity.BatchDocumentMessage; +import com.weaver.common.batch.entity.BatchFile; +import com.weaver.common.batch.entity.ExcelSheet; +import com.weaver.common.batch.sender.BatchExportSender; +import com.weaver.common.cache.tablecache.impl.ComInfoCache; +import com.weaver.common.component.table.WeaTable; +import com.weaver.common.component.table.column.WeaTableColumn; +import com.weaver.common.component.table.page.Page; +import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.common.elog.annotation.HandleElog; +import com.weaver.common.elog.annotation.OperateType; +import com.weaver.common.elog.annotation.handle.ElogMethodHandler; +import com.weaver.common.elog.annotation.handle.MethodHandler; +import com.weaver.common.elog.consts.ElogEsTableConsts; +import com.weaver.common.elog.dao.QueryCommonTabeMapper; +import com.weaver.common.elog.dto.*; +import com.weaver.common.elog.enums.ElogConsts; +import com.weaver.common.elog.service.ApplicationContextProvider; +import com.weaver.common.elog.service.ElogHandleService; +import com.weaver.common.elog.util.*; +import com.weaver.common.hrm.cache.HrmAvatarComInfo; +import com.weaver.common.hrm.cache.HrmEmployeeComInfo; +import com.weaver.common.hrm.domain.organization.HrmConditionResultType; +import com.weaver.common.hrm.domain.organization.HrmOrgEmpCondition; +import com.weaver.common.hrm.entity.employee.HrmEmployee; +import com.weaver.common.hrm.service.HrmCommonEmployeeService; +import com.weaver.common.hrm.util.HrmCommonUtil; +import com.weaver.common.hrm.util.HrmI18nUtil; +import com.weaver.common.i18n.label.SystemEnv; +import com.weaver.common.i18n.tool.config.date.format.DateRangeTransformer; +import com.weaver.common.i18n.tool.util.I18nUtil; +import com.weaver.common.mybatis.baseConfig.WeaDatabaseIdProvider; +import com.weaver.common.mybatis.util.DatabaseUtil; +import com.weaver.common.security.util.SecurityUtil; +import com.weaver.framework.rpc.context.impl.TenantRpcContext; +import com.weaver.teams.security.context.UserContext; +import com.weaver.teams.security.user.User; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.elasticsearch.action.admin.indices.get.GetIndexRequest; +import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.client.indices.CreateIndexRequest; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.SearchHits; +import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.elasticsearch.xcontent.XContentType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.annotation.AnnotationUtils; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.*; +import java.util.stream.Collectors; + +import static com.weaver.common.elog.consts.LogConstants.MAPPING_TEMPLATE; + +public class LoggerTableService implements ILoggerTableService { + + private static final Logger logger = LoggerFactory.getLogger(LoggerTableService.class); + + @Autowired + private LocalElogDaoMapper localElogDaoMapper; + + @Autowired + private ComInfoCache comInfoCache; + + @Autowired + private HrmCommonUtil hrmCommonUtil; + + @Autowired + private QueryCommonTabeMapper queryCommonTabeMapper; + + @Autowired + private RestHighLevelClient restHighLevelClient; + + @Resource + private BatchExportSender batchExportSender; + + + @Resource + private DateRangeTransformer dateRangeTransformer; + + @Autowired + private HrmCommonEmployeeService hrmCommonEmployeeService; + + + private static final String databaseId = DatabaseUtil.getDatabaseId(); + + @Override + public WeaTable queryLogs(String data) { + //解析数据 + ElogBean elogBean = ElogServiceUtils.getElogBean(data); + // columIndex统一转为小写 + Optional.ofNullable(elogBean.getShowColumns()) + .ifPresent(list -> { + list.forEach(x -> { + if (StringUtils.isNotBlank(x.getColumIndex())) { + x.setColumIndex(x.getColumIndex().toLowerCase()); + } + }); + }); + + List showColums = elogBean.getShowColumns(); + String module = elogBean.getModule(); + String function = elogBean.getFunction(); + String searchMap = elogBean.getSearchMap(); + String pageSize = elogBean.getPageSize(); + String pageNum = elogBean.getPageNum(); + String downloadSize = elogBean.getDownloadSize(); + List filterConditionDtos = elogBean.getFilterConditionDtos(); + String transMethod = elogBean.getTransMethod(); + Map authParamsJson = elogBean.getAuthParamsJson(); + + //获取 context 数据 + LoggerContext context = new LoggerContext(); + context.setModuleName(module); + context.setFunctionName(function); + context.setTenant_key(getTenantKey()); +// context.setOperator(getEmployeeId()); + //获取主表 + String tableName = ElogSeviceUtils.getTableName(module, function); + //获取weaTable + WeaTable weaTable = new WeaTable(); + List recordColumns = getWeaColumns(data, showColums, module, function, weaTable); + //获取条件sql + String searchMapsql = getSearchMapSql(searchMap, module, function,elogBean.getShowColumns()); + String sb = getQueryCondition(filterConditionDtos); + sb = searchMapsql.concat(sb); + //处理数据权限 + Map res = getCustomAuthSql(transMethod, authParamsJson, "auth"); + if (!res.isEmpty()) { + Object flag = res.get("flag"); + if (flag != null && flag instanceof Boolean) { + boolean f = (boolean) flag; + if (!f) { + weaTable.setCustomParameters(res); + return weaTable; + } + } + } + String customSql = getCustomSql(transMethod, sb, "before"); + //处理数据权限（前缀） + Map hashMap = addPermissionHandler(transMethod); + logger.info("查询条件sql:{}", customSql); + //处理数据权限（对接权限sql) + PermissionParams permissionParams = getPermissionParams(hashMap); + String permissionId = permissionParams.getPermissionId(); + String permissionType = permissionParams.getPermissionType(); + String mainDataTable = permissionParams.getMainDataTable(); + String mainDataTableAlias = permissionParams.getMainDataTableAlias(); + String primaryKey = permissionParams.getPrimaryKey(); + String permissionTargetId = permissionParams.getPermissionTargetId(); + String permissionConfigSourceId = permissionParams.getPermissionConfigSourceId(); + + + // 设置操作菜单 + //weaTable.getOperates().add(new WeaTableOperate("查看", 1)); + + // 分页 + //Page page = ElogSeviceUtils.getPage(); + Page page = null; + if (StringUtils.isEmpty(downloadSize)) { + page = new Page(ElogSeviceUtils.getIntValue(pageNum, 1), ElogSeviceUtils.getIntValue(pageSize, 10)); + } else { + int pagesize = ElogSeviceUtils.getIntValue(downloadSize, 5000); + page = new Page(1, pagesize); + } + + String columns = getshowColumsStr(showColums); + + Map countMap = new HashMap<>(); + Long countNum = 0l; + + //最终查询前 + List interceptChain = ApplicationContextProvider.getServiceBean(ElogHandleService.class) + .stream().filter(Objects::nonNull) + .filter(x -> x instanceof ElogHandleService) + .map(x -> (ElogHandleService) x) + .collect(Collectors.toList()); + + if (CollectionUtils.isNotEmpty(interceptChain)) { + for (ElogHandleService handleService : interceptChain) { + Class itemClass = handleService.getClass(); + HandleElog annotation = itemClass.getAnnotation(HandleElog.class); + if(Objects.isNull(annotation)){ + annotation = AnnotationUtils.findAnnotation(itemClass, HandleElog.class); + } + if(Objects.nonNull(annotation)){ + if(module.equalsIgnoreCase(annotation.modulename())){ + String employeeId = getUserId(); + long id = StringUtils.isEmpty(employeeId) ? -1 : Long.parseLong(employeeId); + ElogHandleDto elogHandleDto = new ElogHandleDto(module,function,context.getTenant_key(),id,customSql,filterConditionDtos); + boolean preQuery = handleService.preQuery(elogHandleDto); + customSql = elogHandleDto.getSql(); + } + } + } + } + + // 查询 + List list = new ArrayList<>(); + if (StringUtils.isNotEmpty(permissionId) || StringUtils.isNotEmpty(permissionType) || StringUtils.isNotEmpty(mainDataTableAlias) || StringUtils.isNotEmpty(mainDataTable) || StringUtils.isNotEmpty(permissionTargetId) || StringUtils.isNotEmpty(permissionConfigSourceId)) { + list = localElogDaoMapper.queryElogList(page, context, null, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey,permissionTargetId,permissionConfigSourceId,"*"); + countNum = localElogDaoMapper.elogCountOnlyNum(context, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey,permissionTargetId,permissionConfigSourceId); + } else { + list = localElogDaoMapper.queryElogList(page, context, null, tableName, customSql,"*"); + countMap = localElogDaoMapper.elogCount(context, tableName, customSql); + + } + + String databaseId = WeaDatabaseIdProvider.databaseId; + if ("st".equals(databaseId)) { + //st数据库 date类型特殊处理 + list.forEach(map -> { + map.forEach((k, v) -> { + if (v instanceof Date) { + map.put(k, DateUtil.format((Date) v, "yyyy-MM-dd HH:mm:ss")); + } + }); + }); + + } + + String propertiesValue = module + "." + function + ".es"; + String value = ApplicationContextProvider.getPropertiesValue(propertiesValue); + logger.info("propertiesValue:{},value:{}", propertiesValue,value); + if (StringUtils.isNotEmpty(value) && !value.equalsIgnoreCase("${" + propertiesValue + "}")) { + //if判断通过说明走了自定义ES存储es + String[] fields = getESfields(value); + if (fields != null && fields.length > 0) { + for (Map map : list) { + String logDate = map.get("log_date").toString(); + logger.info("logDate:{}" ,logDate); + String esDate = logDate.substring(0, 10); + //先判断表存不存在，不存在创建 + if (checkEsTableIsExist(esDate)) { + // 根据id通过es查询大字段（params）然后赋值 + SearchRequest searchRequest = new SearchRequest(getElogESTableName(true,esDate)); + SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); + // 只获取指定字段 + searchSourceBuilder.fetchSource(fields, null); + // 根据id匹配 + searchSourceBuilder.query(QueryBuilders.termQuery("id",map.get("id").toString())); + searchRequest.source(searchSourceBuilder); + + SearchResponse searchResponse = null; + try { + searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); + } catch (IOException e) { + logger.info("查询ES出现异常:{}",e.getMessage()); + } + SearchHits hits = searchResponse.getHits(); + SearchHit[] searchHits = hits.getHits(); + if (searchHits != null && searchHits.length > 0) { + // 根据id匹配唯一，所以直接取第一个 + Map sourceAsMap = searchHits[0].getSourceAsMap(); + if (Objects.nonNull(sourceAsMap) && sourceAsMap.size() > 0) { + logger.info("ES查出来的sourceAsMap:{}",JSON.toJSONString(sourceAsMap)); + map.putAll(sourceAsMap); + } + } + } + } + } + } + //处理转换其他数据库类型值 + list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); + //处理用户信息Data + + // 大小写转换 + ElogSeviceSwitchUtils.changKey2Lower(list); + + transSwitchDataInfo(list,recordColumns); + //转换多语言 + //ElogSeviceSwitchUtils.switchValues(list, recordColumns, true); + //ElogSeviceSwitchUtils.switchChangeValues(list); + logger.info("开始执行转换方法"); + if (Util.isNotEmpty(transMethod)) { + logger.info("转换方法:{}", transMethod); + // 消费到消息,通过MethodHandler调用对应的方法 + MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(transMethod); + if (methodHandler != null) { + try { + logger.info("执行方法前的数据:{}", JSON.toJSONString(list)); + methodHandler.execute(list); + logger.info("执行方法后的数据:{}", JSON.toJSONString(list)); + } catch (Exception e) { + logger.error("转换出错：" + e); + } + } + + } + page.setTotal(ElogSeviceUtils.getLongValue(countMap.get("counts") + "", 0)); + page.setRecords(switchString(list)); + if (!countNum.equals(0l)) { + //countNum不为0 则覆盖 + page.setTotal(countNum); + + } + // 处理后的数据 + // weaTable.setDisplayData(DataTransform.userProcessData(page.getRecords())); + + // 处理操作菜单权限 + //weaTable.setOperatesPermission(DataTransform.userOperatesPermission(page.getRecords())); + + // 处理选择框权限 + //weaTable.setCheckBoxPermission(DataTransform.userCheckBoxPermission(page.getRecords())); + + // 存放结果集 + weaTable.setPage(page); + return weaTable; + } + + @Override + public WeaTable queryLogsPapi(String data, HttpServletRequest request) { + return null; + } + + @Override + public List getDetailChangesPapi(String module, String function, String mainid, String transMethod, HttpServletRequest request) { + return null; + } + + + private String getshowColumsStr(List showColums) { + StringBuffer sb = new StringBuffer(); + sb.append("id,uuid,targetid,params,operatetype,link_id,link_type,"); + for (ShowColumsDto showColum : showColums) { + String columIndex = showColum.getColumIndex(); + if ("date".equalsIgnoreCase(columIndex) || "createdate".equalsIgnoreCase(columIndex)){ + columIndex = "log_date"; + }else if ("operator".equalsIgnoreCase(columIndex)){ + columIndex = "log_operator"; + }else if ("modulenamespan".equalsIgnoreCase(columIndex)){ + columIndex = "modulename"; + } else if ("functionnameespan".equalsIgnoreCase(columIndex)){ + columIndex = "functionname"; + } else if ("avatar".equals(columIndex)) { + continue; + } + sb.append(columIndex).append(","); + } + String substring = sb.toString().substring(0, sb.toString().length() - 1); + return substring; + } + + private PermissionParams getPermissionParams(Map hashMap) { + PermissionParams permissionParams = new PermissionParams(); + String permissionId = getPermissionStr(hashMap, "permissionId"); + String permissionType = getPermissionStr(hashMap, "permissionType"); + String mainDataTableAlias = getPermissionStr(hashMap, "mainDataTableAlias"); + String mainDataTable = getPermissionStr(hashMap, "mainDataTable"); + String primaryKey = getPermissionStr(hashMap, "primaryKey"); + String permissionTargetId = getPermissionStr(hashMap, "permissionTargetId"); + String permissionConfigSourceId = getPermissionStr(hashMap, "permissionConfigSourceId"); + + permissionParams.setPermissionId(permissionId); + permissionParams.setPermissionType(permissionType); + permissionParams.setMainDataTableAlias(mainDataTableAlias); + permissionParams.setMainDataTable(mainDataTable); + permissionParams.setPrimaryKey(primaryKey); + permissionParams.setPermissionTargetId(permissionTargetId); + permissionParams.setPermissionConfigSourceId(permissionConfigSourceId); + + return permissionParams; + + } + + private List getWeaColumns(String data, List showColums, String module, String function, WeaTable weaTable) { + // 每一个Table的唯一标识 + weaTable.setPageUid(IdGenerator.generate() + ""); + // 表头 + //weaTable.getColumns().add(new WeaTableColumn("id","id", true)); + List recordColumns = new ArrayList<>(); + if (showColums != null && showColums.size() > 0) { + for (ShowColumsDto showColum : showColums) { + if (showColum.isTransfLanguage()) { + recordColumns.add(showColum.getColumIndex()); + } + if (StringUtils.isNotBlank(showColum.getAliasColumName())) { + WeaTableColumn weaTableColumn = new WeaTableColumn(showColum.getAliasColumName(), showColum.getColumIndex(), getColumnsWidth(showColum), "", showColum.isHide()); + if (showColum.isNewLine()) { + weaTableColumn.setNewLine(showColum.isNewLine()); + } + weaTable.getColumns().add(weaTableColumn); + } else if (StringUtils.isNotBlank(showColum.getColumName())) { + WeaTableColumn weaTableColumn = new WeaTableColumn(FieldNameMap.getMainFieldNameMap(data, function, showColum.getColumName()), showColum.getColumIndex(), getColumnsWidth(showColum), "", showColum.isHide()); + if (showColum.isNewLine()) { + weaTableColumn.setNewLine(showColum.isNewLine()); + } + weaTable.getColumns().add(weaTableColumn); + } + } + } else { + weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "moduleName"), "modulenamespan", "5%")); + weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "functionName"), "functionnamespan", "5%")); + weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "clientIp"), "clientip", "5%")); + weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "operateTypeName"), "operatetypename", "5%")); + weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "targetName"), "targetname", "5%")); + weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "date"), "createdate", "5%")); + weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "operatorName"), "operatorname", "5%")); + } + return recordColumns; + } + + private String getTargetid(List filterConditionDtos) { + if (!filterConditionDtos.isEmpty()) { + for (FilterConditionDto filterConditionDto : filterConditionDtos) { + if ("targetid".equalsIgnoreCase(filterConditionDto.getColumIndex())) { + return filterConditionDto.getValue(); + } + } + } + return ""; + } + + private String getPermissionStr(Map hashMap, String str) { + if (hashMap != null && hashMap.size() > 0) { + Object obj = hashMap.get(str); + if (obj != null) { + return obj.toString(); + } + } + return ""; + } + + /** + * 处理数据权限 + * + * @param transMethod + * @return + */ + private Map addPermissionHandler(String transMethod) { + Map hashMap = new HashMap(); + hashMap.put("permissionId", ""); + hashMap.put("permissionType", ""); + hashMap.put("mainDataTableAlias", ""); + hashMap.put("mainDataTable", ""); + hashMap.put("primaryKey", ""); + hashMap.put("permissionTargetId", ""); + hashMap.put("permissionConfigSourceId", ""); + + MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler("permission" + transMethod); + if (beforeMethodHandler != null) { + try { + Object execute = beforeMethodHandler.execute(hashMap); + if (execute != null) { + if (execute instanceof Map) { + return (Map) execute; + } + } + } catch (Exception e) { + logger.error("转换出错：" + e); + throw new RuntimeException(e.getMessage()); + } + } + return hashMap; + } + + private Map getCustomAuthSql(String transMethod, Map params, String prefix) { + MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); + Map hashMap = new HashMap<>(); + if (beforeMethodHandler != null) { + try { + hashMap.put("flag", true); + hashMap.put("msg", ""); + hashMap.putAll(params); + Object execute = beforeMethodHandler.execute(hashMap); + if (execute != null && execute instanceof Map) { + Map map = (Map) execute; + return map; + } + } catch (Exception e) { + logger.error("转换出错：" + e); + throw new RuntimeException(e.getMessage()); + } + } + return hashMap; + } + + + private String getCustomSql(String transMethod, String sql, String prefix) { + MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); + boolean flag = false; + if (beforeMethodHandler != null) { + try { + String subSql = ""; + if (sql.length() > 5) { + flag = true; + subSql = sql.substring(5, sql.length()); + } + Object execute = beforeMethodHandler.execute(subSql); + if (execute != null) { + if (execute instanceof String) { + StringBuffer sb = null; + if(execute.toString().length()==0){ + sb = new StringBuffer(); + } else if (flag || execute.toString().length() > 0) { + sb = new StringBuffer(" and "); + } else { + sb = new StringBuffer(); + } + + sb.append(execute.toString()); + return sb.toString(); + } + } + } catch (Exception e) { + logger.error("转换出错：" + e); + throw new RuntimeException(e.getMessage()); + } + } + return sql; + } + + private void transUserInfo(List list) { + List operators = new ArrayList<>(); + if (list != null && list.size() > 0) { + for (Map map : list) { + //避免暴露内网地址 + map.remove("requesturl"); + + Object operator = map.get("operator"); + if (operator != null && StringUtils.isNotBlank(operator.toString())) { + operators.add(ElogSeviceUtils.getLongValue(operator.toString())); + } + } + } + List cacheList = comInfoCache.getCacheList(HrmEmployeeComInfo.class, operators); + Map infoHashMap = new HashMap<>(); + if (cacheList != null && cacheList.size() > 0) { + for (HrmEmployeeComInfo hrmEmployeeComInfo : cacheList) { + HrmAvatarComInfo hrmAvatarComInfo = (HrmAvatarComInfo) comInfoCache.getCacheById(HrmAvatarComInfo.class, hrmEmployeeComInfo.getAvatar()); + ElogHrmSimpleEmployeeInfo info = new ElogHrmSimpleEmployeeInfo(); + if (hrmAvatarComInfo != null) { + info.setAvatarP3Id(hrmAvatarComInfo.getP3()); + } + info.setId(hrmEmployeeComInfo.getId()); + info.setUserName(hrmEmployeeComInfo.getUsername()); + infoHashMap.put(hrmEmployeeComInfo.getId(), info); + } + } + if (list != null && list.size() > 0) { + for (Map map : list) { + Object operator = map.get("operator"); + if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { + map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); + } + map.put("dboperatorname", Util.null2String(map.get("operatorname"))); + if (operator != null && StringUtils.isNotBlank(operator.toString())) { + Map i18nOperatorMap = new HashMap<>(); + ElogHrmSimpleEmployeeInfo hrmEmployeeComInfo = infoHashMap.get(Long.parseLong(operator.toString())); + if (hrmEmployeeComInfo != null) { + //获取最新的人员名称并进行多语言转换 + i18nOperatorMap.put(Long.parseLong(operator.toString()),hrmEmployeeComInfo.getUserName()); + Map parseI18nOperator = HrmI18nUtil.batchCovertEmployee(i18nOperatorMap, map.get("tenant_key").toString()); + map.put("operatorname", parseI18nOperator.get(Long.parseLong(operator.toString()))); + +// if (StringUtils.isNotEmpty(hrmEmployeeComInfo.getUserName())) { +// map.put("operatorname", hrmEmployeeComInfo.getUserName()); +// } + if (hrmEmployeeComInfo.getAvatarP3Id() != null) { + map.put("avatar", hrmEmployeeComInfo.getAvatarP3Id()); + } + } + } + } + } + } + + private void transSwitchDataInfo(List list, List recordColumns) { + List operators = new ArrayList<>(); + if (list != null && list.size() > 0) { + for (Map map : list) { + //避免暴露内网地址 + map.remove("requesturl"); + + map.put("dboperatorname", Util.null2String(map.get("operatorname"))); + ElogSeviceSwitchUtils.switchDatabaseField(map); + Object operator = map.get("operator"); + if (operator != null && StringUtils.isNotBlank(operator.toString())) { + operators.add(ElogSeviceUtils.getLongValue(operator.toString())); + } + if (map.get("PARAMS") != null) { + map.put("params", JSONObject.toJSON(map.get("PARAMS"))); + } else if (map.get("params") != null) { + map.put("params", JSONObject.toJSON(map.get("params"))); + } + for (String recordColumn : recordColumns) { + Object val = map.get(recordColumn); + if (val != null) { + map.put(recordColumn, ElogSeviceSwitchUtils.transfi18Method(val.toString())); + } + } + Object modulename = map.get("modulename"); + if (modulename != null) { + map.put("modulenamespan", ElogSeviceSwitchUtils.getModuleName(modulename.toString())); + } + + } + } + List cacheList = comInfoCache.getCacheList(HrmEmployeeComInfo.class, operators); + Map infoHashMap = new HashMap<>(); + if (cacheList != null && cacheList.size() > 0) { + for (HrmEmployeeComInfo hrmEmployeeComInfo : cacheList) { + ElogHrmSimpleEmployeeInfo info = new ElogHrmSimpleEmployeeInfo(); + info.setId(hrmEmployeeComInfo.getId()); + info.setUserName(hrmEmployeeComInfo.getUsername()); + infoHashMap.put(hrmEmployeeComInfo.getId(), info); + } + } + if (list != null && list.size() > 0) { + for (Map map : list) { + Object operator = map.get("operator"); + if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { + map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); + map.put("params",SecurityUtil.encodeForHtml(map.get("params").toString(), true)); + + } + //获取最新的人员名称并进行多语言转换 + if (operator != null && StringUtils.isNotBlank(operator.toString())) { + Map i18nOperatorMap = new HashMap<>(); + ElogHrmSimpleEmployeeInfo hrmEmployeeComInfo = infoHashMap.get(Long.parseLong(operator.toString())); + if (hrmEmployeeComInfo != null && StringUtils.isNotEmpty(hrmEmployeeComInfo.getUserName())) { + i18nOperatorMap.put(Long.parseLong(operator.toString()),hrmEmployeeComInfo.getUserName()); + Map parseI18nOperator = HrmI18nUtil.batchCovertEmployee(i18nOperatorMap, map.get("tenant_key").toString()); + map.put("operatorname", parseI18nOperator.get(Long.parseLong(operator.toString()))); +// map.put("operatorname", hrmEmployeeComInfo.getUserName()); + } + } + } + } + } + + /** + * 查询头像相关信息 + * + * @param id + * @return + */ +// private String queryAvatarInfo(long id) { +// Map avatarInfoMap = queryAvatarInfoMapper.queryAvatarInfo(id); +// if (avatarInfoMap != null) { +// if (avatarInfoMap.get("p3") != null) { +// return avatarInfoMap.get("p3").toString(); +// } +// } +// return ""; +// } + + /** + * 获取宽度 + * + * @param showColum + * @return + */ + private String getColumnsWidth(ShowColumsDto showColum) { + if (StringUtils.isBlank(showColum.getWidth())) { + return "5%"; + } else { + return showColum.getWidth(); + } + } + + private String getTenantKey() { + User currentUser = UserContext.getCurrentUser(); + if (currentUser != null) { + return currentUser.getTenantKey(); + } else { + String tenantKey = TenantRpcContext.getTenantKey(); + if (StringUtils.isNotBlank(tenantKey)) { + return tenantKey; + } + } + return ""; + } + + private String getEmployeeId() { + + User currentUser = UserContext.getCurrentUser(); + if (currentUser != null&&!currentUser.isAdmin()) { + String employeeId = TenantRpcContext.getEmployeeId(); + return StringUtils.isNotBlank(employeeId) ? employeeId : ""; + } + return ""; + } + + private String getUserId(){ + User currentUser = UserContext.getCurrentUser(); + if (currentUser != null) { + return currentUser.getEmployeeId().toString(); + } + String employeeId = TenantRpcContext.getEmployeeId(); + return StringUtils.isNotBlank(employeeId) ? employeeId : ""; + } + + /** + * 拼接搜索条件 + * + * @param searchMap + * @param module + * @param function + * @return + */ + private String getSearchMapSql(String searchMap, String module, String function, List showColumns) { + StringBuffer sb = new StringBuffer(); + Map map = JSON.parseObject(searchMap); + if (map == null) return sb.toString(); + Iterator> iterators = map.entrySet().iterator(); + while (iterators.hasNext()) { + Map.Entry next = iterators.next(); + String key = next.getKey(); + SecurityUtil.sqlCheck(key); + if ("date".equals(key) || "createdate".equals(key)) { + Object date = next.getValue(); + if (date != null) { + if (StringUtils.isNotBlank(date.toString())) { + List dates = (List) date; + if (dates != null && dates.size() == 2) { + Object startDate = dates.get(0); + Object endDate = dates.get(1); + startDate = ElogSeviceUtils.checkValSql(startDate.toString()); + endDate = ElogSeviceUtils.checkValSql(endDate.toString()); + if (StringUtils.isNotBlank(startDate.toString()) && StringUtils.isNotBlank(endDate.toString())) { + startDate = startDate.toString().replaceAll("'", "''"); + endDate = endDate.toString().replaceAll("'", "''"); + String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); + String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); + sb.append(" and log_date ").append(" between ").append(getSwithDatabaseDate(dateRangeAfter)).append(" and ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); + } else if (StringUtils.isNotBlank(startDate.toString())) { + String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); + sb.append(" and log_date ").append(" >= ").append(getSwithDatabaseDate(dateRangeAfter)).append(" "); + } else if (StringUtils.isNotBlank(endDate.toString())) { + String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); + sb.append(" and log_date ").append(" <= ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); + } + } + } + } + } else if ("operator".equals(next.getKey())) { + Object operator = next.getValue(); + if (operator != null) { + if (StringUtils.isNotBlank(operator.toString())) { + operator = ElogSeviceUtils.checkValSql(operator.toString()); + operator = operator.toString().replaceAll("'", "''"); + if (StringUtils.isNumeric(operator.toString()) && operator.toString().length() > 15 ) { + sb.append(" and log_operator = ").append(operator.toString()).append(" "); + } else { + List likeNameHrmEmployeeList = hrmCommonEmployeeService.queryEmpsByCondidtion( + new HrmOrgEmpCondition().setNameLikeList(Arrays.asList(operator.toString())).setTenantKey(getTenantKey()), + HrmConditionResultType.BEAN.name()); + if (likeNameHrmEmployeeList != null && likeNameHrmEmployeeList.size() > 0) { + List ids = likeNameHrmEmployeeList.stream().map(HrmEmployee::getId).collect(Collectors.toList()); + if (ids != null && ids.size() > 0) { + sb.append(" and ( operatorname like '%").append(operator.toString()).append("%' ") + .append(" or log_operator in (").append(StringUtils.join(ids, ",")).append(")) "); + } + } else { + sb.append(" and operatorname like '%").append(operator.toString()).append("%' "); + } + } + } + } + } else if ("modulename".equals(next.getKey())) { + Object moduleName = next.getValue(); + if (moduleName != null) { + moduleName = moduleName.toString().replaceAll("'", "''"); + if (StringUtils.isNotBlank(moduleName.toString())) { + moduleName = ElogSeviceUtils.checkValSql(moduleName.toString()); + //sb.append(" and modulename = '").append(moduleName.toString()).append("' "); + StringBuffer stringBuffer = new StringBuffer(); + if (isEnglish(moduleName.toString())) { + Map moduleMap = ElogSeviceSwitchUtils.moduleMap; + Iterator> iterator = moduleMap.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry nextObj = iterator.next(); + if (nextObj.getKey().contains(moduleName.toString())) { + stringBuffer.append("'").append(nextObj.getKey()).append("',"); + } + } + + } else { + Map moduleMap = ElogSeviceSwitchUtils.moduleMap; + Iterator> iterator = moduleMap.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry nextObj = iterator.next(); + String val = ElogSeviceSwitchUtils.getModuleName(nextObj.getValue() + ""); + if (val.contains(moduleName.toString())) { + stringBuffer.append("'").append(nextObj.getKey()).append("',"); + } + } + } + String str = ""; + if (stringBuffer.toString().length() > 0) { + str = stringBuffer.substring(0, stringBuffer.length() - 1); + String inVals = str.toString().replaceAll("''", "'"); + sb.append(" and modulename in (").append(inVals).append(") "); + } else { + sb.append(" and modulename = '").append(moduleName.toString()).append("' "); + } + } + } + } else if (databaseId.equalsIgnoreCase(ElogConsts.POSTGRESQL) && "targetid".equalsIgnoreCase(next.getKey())){ + //兼容PG环境int类型不支持模糊搜索的问题 + String value = next.getValue().toString().replaceAll("'", "''"); + value = ElogSeviceUtils.checkValSql(value.toString()); + if (value.startsWith("_")) { + value = value.replace("_", "\\_"); + } + //将类型转为varchar再进行查询 + sb.append(" and ").append("cast(").append(key).append(" as VARCHAR(255) )").append(" like '%").append(value).append("%' "); + } else { + + if (next.getValue() != null && StringUtils.isNotBlank(key) && StringUtils.isNotBlank(next.getValue().toString())) { + String value = next.getValue().toString().replaceAll("'", "''"); + value = ElogSeviceUtils.checkValSql(value.toString()); + StringBuilder stringBuffer = new StringBuilder(); + if (isLikeSearch(showColumns, key)) { + String logSearchSql = I18nUtil.getLogSearchSql(ElogSeviceUtils.getTableName(module, function), key, value); + String sql = logSearchSql.replaceAll("%_", "%\\\\_"); + try { + logger.error("执行多语言sql：{}",sql); + List maps = queryCommonTabeMapper.queryLabelIds(sql); + if (maps != null && maps.size() > 0) { + for (Map map1 : maps) { + Object indexid = map1.get(key); + if (indexid == null || StringUtils.isEmpty(indexid.toString())) { + indexid = map1.get(key.toLowerCase()); + } + if (indexid != null && StringUtils.isNotEmpty(indexid.toString())) { + String val = indexid.toString().replace("'", "''"); + if (ElogSeviceUtils.checkIsNumber(map.get(key))) { + val = "-"+val; + value = "-"+value; + } + stringBuffer.append("'").append(val).append("',"); + } + } + } + } catch (Exception e) { + logger.error("i18查询sql报错：{}",e.getMessage(),e); + } + + } + String str = ""; + if (stringBuffer.toString().length() > 0) { + str = stringBuffer.substring(0, stringBuffer.length() - 1); + if (value.startsWith("_")) { + value = value.replace("_", "\\_"); + } + sb.append(" and (").append(key).append(" like '%").append(value).append("%' "); + //String inVals = str.toString().replaceAll("''", "'"); + if (str.startsWith("_")) { + str = str.replace("_", "\\_"); + } + if ("operatetypename".equals(key)) { + String s = ElogSeviceUtils.checkValSql(next.getValue().toString()); + sb.append(matchOperatetype(s)); + } + sb.append(" or ").append(key).append(" in (").append(str).append(")) "); + } else { + if ("operatetypename".equals(key)) { + sb.append(" and (").append(key).append(" like '%").append(value).append("%' "); + String s = ElogSeviceUtils.checkValSql(next.getValue().toString()); + sb.append(matchOperatetype(s)).append(")"); + } else { + if (value.startsWith("_")) { + value = value.replace("_", "\\_"); + } + sb.append(" and ").append(key).append(" like '%").append(value).append("%' "); + } + } + + } + } + } + return sb.toString(); + } + + /** + * 是否模糊搜索 + * @param showColumns + * @param key + * @return + */ + private boolean isLikeSearch(List showColumns, String key) { + for (ShowColumsDto showColumn : showColumns) { + if (key.equalsIgnoreCase(showColumn.getColumIndex()) && showColumn.isTransfLanguage()) { + return true; + } + } + return false; + } + + private String getSwithDatabaseDate(String date) { + SecurityUtil.ecodeForSql(date); + if (ElogConsts.ORACLE.equals(DatabaseUtil.getDatabaseId())) { + return " to_date('"+date+"','yyyy-mm-dd hh24:mi:ss') "; + } else if (ElogConsts.POSTGRESQL.equals(DatabaseUtil.getDatabaseId())) { + return " to_timestamp('"+date+"', 'YYYY-MM-DD HH24:MI:SS') "; + } else if (ElogConsts.SQLSERVER.equals(DatabaseUtil.getDatabaseId())) { + return " convert(nvarchar(19),'"+date+"',120) "; + } else { + return " DATE_FORMAT('"+date+"','%Y-%m-%d %H:%i:%s') "; + } + } + + public String matchOperatetype(String str) { + if (ElogSeviceUtils.currentLanguage() != 8) { + return ""; + } + List list = new ArrayList(); + list.add(OperateType.add); + list.add(OperateType.update); + list.add(OperateType.view); + list.add(OperateType.delete); + + StringBuffer sb = new StringBuffer(); + for (String o : list) { + if (o.toLowerCase().contains(str.toLowerCase())) { + sb.append("'").append(o).append("',"); + } + } + if ("new".toLowerCase().contains(str.toLowerCase())) { + sb.append("'add',"); + } + String sql = ""; + if (sb.length() > 0) { + sql = sb.toString().substring(0, sb.length() - 1); + sql = "or operatetype in (" + sql + ")"; + } + + return sql; + + } + + + public static boolean isEnglish(String charaString) { + return charaString.matches("^[a-zA-Z]*"); + + } + + /** + * 获取搜索条件 + * + * @param filterConditionDtos + * @return + */ + private String getQueryCondition(List filterConditionDtos) { + StringBuffer sb = new StringBuffer(); + if (filterConditionDtos != null && filterConditionDtos.size() > 0) { + for (FilterConditionDto filterConditionDto : filterConditionDtos) { + if (StringUtils.isNotBlank(filterConditionDto.getColumIndex())) { + sb.append(getsql(filterConditionDto)); + } + } + } + return sb.toString(); + } + + /** + * 拼接sql + * + * @param filterConditionDto + * @return + */ + private String getsql(FilterConditionDto filterConditionDto) { + StringBuffer sb = new StringBuffer(); + /* if (StringUtils.isNotBlank(filterConditionDto.getSql())) { + sb.append(" ").append(filterConditionDto.getSql()).append(" "); + return sb.toString(); + }*/ + SecurityUtil.sqlCheck(filterConditionDto.getColumIndex()); + filterConditionDto.setConnectCondition(ElogSeviceUtils.checkConditionSql(filterConditionDto.getConnectCondition())); + filterConditionDto.setType(ElogSeviceUtils.checkTypeSql(filterConditionDto.getType())); + filterConditionDto.setValue(ElogSeviceUtils.checkValSql(filterConditionDto.getValue())); + switchDatabaseFieldIndex(filterConditionDto); + if ("LIKE".equalsIgnoreCase(filterConditionDto.getType())) { + if (filterConditionDto.getLike() != null) { + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(" '"). + append(filterConditionDto.getLike().getPrefix() != null ? filterConditionDto.getLike().getPrefix() : ""). + append(filterConditionDto.getValue()). + append(filterConditionDto.getLike().getSuffix() != null ? filterConditionDto.getLike().getSuffix() : ""). + append("' "); + } + } else if ("IN".equalsIgnoreCase(filterConditionDto.getType())) { + String[] split = filterConditionDto.getValue().split("\",\""); + if (split.length > 0) { + StringBuffer str = new StringBuffer("("); + String value = ""; + if ("targetid".equals(filterConditionDto.getColumIndex()) || "log_operator".equals(filterConditionDto.getColumIndex())) { + List list = JSONArray.parseArray(filterConditionDto.getValue(), String.class); + for (String s : list) { + str.append(s).append(","); + } + } else { + List list = JSONArray.parseArray(filterConditionDto.getValue(), String.class); + for (String s : list) { + str.append("'").append(s).append("',"); + } + } + + value = str.toString().substring(0, str.length() - 1); + value += ")"; + switchDatabaseFieldIndex(filterConditionDto); + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(value). + append(" "); + + } else if (split.length == 0) { + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(" ('"). + append(filterConditionDto.getValue()). + append("') "); + } + } else if ("IS NULL".equalsIgnoreCase(filterConditionDto.getType()) || "IS NOT NULL".equalsIgnoreCase(filterConditionDto.getType())) { + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(" "); + } else if ("BETWEEN".equalsIgnoreCase(filterConditionDto.getType())) { + String[] split = filterConditionDto.getValue().split("\",\""); + StringBuffer stringBuffer = new StringBuffer(); + if (split.length > 0) { + List list = JSONArray.parseArray(filterConditionDto.getValue(), String.class); + String str = ""; + for (String s : list) { + stringBuffer.append(" '").append(s).append("' AND"); + } + str = stringBuffer.toString().substring(0, stringBuffer.length() - 3); + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(str). + append(" "); + } else if (split.length == 0) { + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(" '"). + append(filterConditionDto.getValue()). + append("' "); + } + } else { + if ("targetid".equals(filterConditionDto.getColumIndex()) || "log_operator".equals(filterConditionDto.getColumIndex())) { + if (StringUtils.isNotBlank(filterConditionDto.getValue())) { + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(" "). + append(filterConditionDto.getValue()). + append(" "); + } else { + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(" "). + append(-1). + append(" "); + } + } else { + sb.append(" "). + append(getConnectCondition(filterConditionDto.getConnectCondition())). + append(" "). + append(filterConditionDto.getColumIndex()). + append(" "). + append(getQueryType(filterConditionDto.getType())). + append(" '"). + append(filterConditionDto.getValue()). + append("' "); + } + + } + return sb.toString(); + } + + private void switchDatabaseFieldIndex(FilterConditionDto filterConditionDto) { + if ("operator".equalsIgnoreCase(filterConditionDto.getColumIndex())) { + filterConditionDto.setColumIndex("log_operator"); + } else if ("date".equalsIgnoreCase(filterConditionDto.getColumIndex())) { + filterConditionDto.setColumIndex("log_date"); + } else if ("result".equalsIgnoreCase(filterConditionDto.getColumIndex())) { + filterConditionDto.setColumIndex("log_result"); + } + } + + + /** + * 获取查询类型 + * + * @param type + * @return + */ + private String getQueryType(String type) { + //如果不填默认是= + if (StringUtils.isBlank(type)) { + return " = "; + } + return type; + } + + /** + * 获取连接条件 + * + * @param connectCondition + * @return + */ + private String getConnectCondition(String connectCondition) { + //如果不填默认是AND + if (StringUtils.isBlank(connectCondition)) { + return " AND "; + } + return connectCondition; + } + + @Override + public List> getDetailChanges(String module, String function, String mainid, String detailTransMethod) { + List> list = getDetailChangesMethod(module, function, mainid, detailTransMethod, null); + return list; + + } + + /** + * 明细分页查询 + * @param module + * @param function + * @param mainid + * @param detailTransMethod + * @param current + * @param pageSize + * @return + */ + @Override + public WeaTable getDetailChangePages(String module, String function, String mainid, String detailTransMethod, String current, String pageSize) { + + Integer pageNum = Util.getIntValue(current, 1); + Integer size = Util.getIntValue(pageSize, 10); + Page page = new Page(pageNum,size); + + List> list = getDetailChangesMethod(module, function, mainid, null, page); + + //查询分页总数 + String tableName = ElogSeviceUtils.getTableName(module, function, true); + Integer total = localElogDaoMapper.queryAllChangesPageCounts(tableName, mainid); + page.setTotal(total); + WeaTable weaTable =new WeaTable(); + weaTable.setColumns(getDetailColumns(list)); + weaTable.setPage(page); + weaTable.setData(list); + + if (Util.isNotEmpty(detailTransMethod)) { + // 消费到消息,通过MethodHandler调用对应的方法 + MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(detailTransMethod); + if (methodHandler != null) { + try { + methodHandler.execute(weaTable); + } catch (Exception e) { + logger.error("转换出错：" + e); + } + } + } + return weaTable; + } + + private List getDetailColumns(List> list) { + + List columns = new ArrayList<>(); + if (Util.isNotEmpty(list)) { + List detailcontexts= (List) list.get(0).get("detailcontexts"); + if (Util.isNotEmpty(detailcontexts)) { + for (Map map : detailcontexts) { + WeaTableColumn weaTableColumn = new WeaTableColumn(); + // 列表属性名 + weaTableColumn.setDataIndex((String) map.get("fieldname")); + //显示名称 多语言转换 fieldnamelabelid + weaTableColumn.setTitle((String) map.get("fieldname")); + columns.add(weaTableColumn); + } + } + } + return columns; + } + + public List> getDetailChangesMethod(String module, String function, String mainid, String detailTransMethod,Page page) { + + List list = new ArrayList<>(); + String tableName = ElogSeviceUtils.getTableName(module, function, true); + String maintableName = ElogSeviceUtils.getTableName(module, function, false); + List maps = localElogDaoMapper.queryAllMainData(maintableName, mainid); + + for (Map map : maps) { + + if (map.get("params") != null && ElogConsts.ES.equalsIgnoreCase(map.get("params").toString())) { + + String logDate = map.get("log_date").toString(); + logger.info("logDate:{}" ,logDate); + String esDate = logDate.substring(0, 10); + //先判断表存不存在，不存在创建 + if (checkEsTableIsExist(esDate)) { + // 根据id通过es查询大字段（params）然后赋值 + SearchRequest searchRequest = new SearchRequest(getElogESTableName(true,esDate)); + + SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); + // 只获取指定字段 + String[] fields = {"params"}; + searchSourceBuilder.fetchSource(fields, null); + // 根据id匹配 + searchSourceBuilder.query(QueryBuilders.termQuery("id",map.get("id").toString())); + searchRequest.source(searchSourceBuilder); + + SearchResponse searchResponse = null; + try { + searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); + } catch (IOException e) { + logger.info("查询ES出现异常:{}",e.getMessage()); + } + + SearchHits hits = searchResponse.getHits(); + SearchHit[] searchHits = hits.getHits(); + if (searchHits != null && searchHits.length > 0) { + // 根据id匹配唯一，所以直接取第一个 + Map sourceAsMap = searchHits[0].getSourceAsMap(); + if (Objects.nonNull(sourceAsMap) && Objects.nonNull(sourceAsMap.get("params")) && StringUtils.isNotEmpty(sourceAsMap.get("params").toString())) { + logger.info("ES查出来的params:{}",sourceAsMap.get("params")); + map.put("params",sourceAsMap.get("params")); + } + } + } + } + if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { + map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); + map.put("params",SecurityUtil.encodeForHtml(map.get("params").toString(), true)); + } + } + + maps = ElogSeviceSwitchUtils.getSwitchDatabaseData(maps); + ElogSeviceSwitchUtils.changKey2Lower(maps); + List allChangesData = new ArrayList<>(); + //如果有分页数据则走分页方法 + if (Objects.nonNull(page) ) { +// Integer offset = (pageNum - 1) * size; + //分页查询明细数据 + allChangesData = localElogDaoMapper.queryAllChangesDataPages(tableName, mainid, page); + } else { + //没有被则不分页 + allChangesData = localElogDaoMapper.queryAllChangesData(tableName, mainid); + } + ElogSeviceSwitchUtils.changKey2Lower(allChangesData); + allChangesData = ElogSeviceSwitchUtils.getSwitchDatabaseData(allChangesData); + List mainlist = new ArrayList<>(); + List detaillist = new ArrayList<>(); + if (allChangesData != null && allChangesData.size() > 0) { + for (Map allChangesDatum : allChangesData) { + Object o = allChangesDatum.get("isdetail"); + if (o != null) { + if ("0".equals(o.toString())) { + mainlist.add(allChangesDatum); + } else { + detaillist.add(allChangesDatum); + } + } + } + } +// List mainlist = localElogDaoMapper.queryAllMainChanges(tableName, mainid); +// List detaillist = localElogDaoMapper.queryAllDetailChanges(tableName, mainid); + //List moduleInfo = queryCommonTabeMapper.queryModuleNameInfo(module); + List moduleInfo = new ArrayList<>(); + processDetailInfo(mainlist, detaillist, moduleInfo); + Map map = ElogSeviceSwitchUtils.switchChangeValue(mainlist, maps); + Map detailMap = ElogSeviceSwitchUtils.switchDetailChangeValue(detaillist); + map.putAll(detailMap); + if (maps != null && maps.size() > 0) { + Map maininfoMap = maps.get(0); + String operatetypename = (String)maininfoMap.get("operatetypename"); + String targetname = (String)maininfoMap.get("targetname"); + //长度大于1避免部分模块为1，2，3这类的操作类型 + if (StringUtils.isNumeric(operatetypename) && operatetypename.length() > 1 && operatetypename.length() < 10) { + String transfOperatetypename = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(operatetypename), operatetypename); + maininfoMap.put("operatetypename",transfOperatetypename); + } + if (StringUtils.isNumeric(targetname) && targetname.length() > 1 && targetname.length() < 10) { + String transfTargetname = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(targetname), targetname); + maininfoMap.put("targetname",transfTargetname); + } + map.put("maininfo",maininfoMap); + + map.put("detailtitle", ""); + } + + list.add(map); + if (Util.isNotEmpty(detailTransMethod)) { + // 消费到消息,通过MethodHandler调用对应的方法 + MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(detailTransMethod); + if (methodHandler != null) { + try { + methodHandler.execute(list); + } catch (Exception e) { + logger.error("转换出错：" + e); + } + } + } + //List transfLanguageData = ElogSeviceSwitchUtils.transfLanguageData(list); + return list; + + } + + /** + * 处理修改详情转多语言(主表和明细表) + * + * @param mainlist + * @param detaillist + * @param commonTableInfo + * @return + */ + private void processDetailInfo(List mainlist, List detaillist, List commonTableInfo) { + Map tablenameMap = new HashMap<>(); + Map fieldnameMap = new HashMap<>(); + Map valueMap = new HashMap<>(); + + if (commonTableInfo != null && commonTableInfo.size() > 0) { + for (Map commonTableInfoMap : commonTableInfo) { + JSONObject commonTableInfoMapJs = JSONObject.parseObject(JSONObject.toJSONString(commonTableInfoMap)); + String tablename = commonTableInfoMapJs.getString("table_name"); + String tablename_labelid = commonTableInfoMapJs.getString("tablename_labelid"); + String fieldname = commonTableInfoMapJs.getString("field_name"); + String fieldname_labelid = commonTableInfoMapJs.getString("fieldname_labelid"); + String values_kvpairs = commonTableInfoMapJs.getString("values_kvpairs"); + fieldnameMap.put(fieldname, fieldname_labelid); + if (StringUtils.isNotBlank(fieldname) && StringUtils.isNotBlank(values_kvpairs)) { + JSONObject jsonObject = JSONObject.parseObject(values_kvpairs); + valueMap.put(fieldname, jsonObject); + } + Object tablenameObj = tablenameMap.get(tablename); + if (tablenameObj == null) { + tablenameMap.put(tablename, tablename_labelid); + } + } + } + + + if (mainlist != null && mainlist.size() > 0 && fieldnameMap.size() > 0 && valueMap.size() > 0) { + for (Map mainlistMap : mainlist) { + JSONObject mainMapJs = JSONObject.parseObject(JSONObject.toJSONString(mainlistMap)); + String fielddesc = mainMapJs.getString("fielddesc"); + String oldvalue = mainMapJs.getString("oldvalue"); + String newvalue = mainMapJs.getString("newvalue"); + if (fieldnameMap.get(fielddesc) != null) { + mainlistMap.put("fielddesc", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(fieldnameMap.get(fielddesc).toString()), fieldnameMap.get(fielddesc).toString())); + } + if (valueMap.get(fielddesc) != null) { + JSONObject jsonObject = JSONObject.parseObject(valueMap.get(fielddesc).toString()); + String oldvalueStr = jsonObject.getString(oldvalue); + String newvalueStr = jsonObject.getString(newvalue); + if (StringUtils.isNotBlank(oldvalueStr)) { + mainlistMap.put("oldvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(oldvalueStr), oldvalue)); + } + if (StringUtils.isNotBlank(newvalueStr)) { + mainlistMap.put("newvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(newvalueStr), newvalue)); + } + } + } + } + + if (detaillist != null && detaillist.size() > 0 && fieldnameMap.size() > 0 && valueMap.size() > 0) { + for (Map detaillistMap : detaillist) { + JSONObject mainMapJs = JSONObject.parseObject(JSONObject.toJSONString(detaillistMap)); + String tablename = mainMapJs.getString("tablename"); + String fielddesc = mainMapJs.getString("fielddesc"); + String oldvalue = mainMapJs.getString("oldvalue"); + String newvalue = mainMapJs.getString("newvalue"); + if (tablenameMap.get(tablename) != null) { + detaillistMap.put("tablename", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(tablenameMap.get(tablename).toString()), tablenameMap.get(tablename).toString())); + } + if (fieldnameMap.get(fielddesc) != null) { + detaillistMap.put("fielddesc", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(fieldnameMap.get(fielddesc).toString()), fieldnameMap.get(fielddesc).toString())); + } + if (valueMap.get(fielddesc) != null) { + JSONObject jsonObject = JSONObject.parseObject(valueMap.get(fielddesc).toString()); + String oldvalueStr = jsonObject.getString(oldvalue); + String newvalueStr = jsonObject.getString(newvalue); + if (StringUtils.isNotBlank(oldvalueStr)) { + detaillistMap.put("oldvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(oldvalueStr), oldvalue)); + } + if (StringUtils.isNotBlank(newvalueStr)) { + detaillistMap.put("newvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(newvalueStr), newvalue)); + } + } + } + } + + } + + @Override + public List queryLogList(String module, String function, String current, String pageSize, String condition) { + LoggerContext context = new LoggerContext(); + context.setModuleName(module); + context.setFunctionName(function); + int pagenum = Util.getIntValue(current, 1) - 1; + int size = Util.getIntValue(pageSize, 10); + int start = pagenum * size; + int end = start + size; + Page page = new Page(pagenum, size); + String limit = " limit " + start + "," + (end - start); + + String tableName = ElogSeviceUtils.getTableName(module, function); + List list = localElogDaoMapper.queryElogList(page, context, null, tableName, null,"*"); + list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); + return switchString(list); + } + + @Override + public List queryCardLogList(String data) { + JSONObject map = JSONObject.parseObject(data); + String module = ""; + String function = ""; + String pageNum = ""; + String pageSize = ""; + String dataset = ""; + String searchMap = ""; + String sColum = ""; + String fColum = ""; + String transMethod = null; + List showColums = new ArrayList<>(); + List filterConditionDtos = new ArrayList<>(); + String authParams = ""; + Map jsonObject = new HashMap(); + if (map != null) { + module = map.getString("module"); + function = map.getString("function"); + pageNum = map.getString("pageNum"); + pageSize = map.getString("pageSize"); + //dataset = map.get("dataset").toString(); + searchMap = map.getString("searchMap"); + sColum = map.getString("showColums"); + showColums = JSONArray.parseArray(sColum, ShowColumsDto.class); + fColum = map.getString("filterConditions"); + transMethod = map.getString("transMethod"); + filterConditionDtos = JSONArray.parseArray(fColum, FilterConditionDto.class); + authParams = map.getString("authParams"); + jsonObject = JSONObject.parseObject(authParams); + } + LoggerContext context = new LoggerContext(); + context.setModuleName(module); + context.setFunctionName(function); + context.setTenant_key(getTenantKey().toLowerCase()); + // 分页 + //Page pages = ElogSeviceUtils.getPage(); + String sb = getQueryCondition(filterConditionDtos); + logger.info("elog查询条件拼接sql：{}", sb); + // 消费到消息,通过MethodHandler调用对应的方法 + //String targetid = getTargetid(filterConditionDtos); + Map customAuthMap = getCustomAuthSql(transMethod, jsonObject, "auth"); + if (!customAuthMap.isEmpty()) { + Object flag = customAuthMap.get("flag"); + if (flag != null && flag instanceof Boolean) { + boolean f = (boolean) flag; + if (!f) { + List list = new ArrayList<>(); + list.add(customAuthMap); + return list; + } + } + } + String customSql = getCustomSql(transMethod, sb, "before"); + + Page pages = new Page(ElogSeviceUtils.getIntValue(pageNum, 1), ElogSeviceUtils.getIntValue(pageSize, 10)); + int page = Util.getIntValue(pages.getCurrent() + "", 1) - 1; + int size = Util.getIntValue(pages.getSize() + "", 10); + int start = page * size; + int end = start + size; + String limit = " limit " + start + "," + (end - start); + String tableName = ElogSeviceUtils.getTableName(module, function); + long l = System.currentTimeMillis(); + Map hashMap = addPermissionHandler(transMethod); + String permissionId = ""; + String permissionType = ""; + String mainDataTableAlias = ""; + String mainDataTable = ""; + String primaryKey = ""; + String permissionTargetId = ""; + String permissionConfigSourceId = ""; + + permissionId = getPermissionStr(hashMap, "permissionId"); + permissionType = getPermissionStr(hashMap, "permissionType"); + mainDataTableAlias = getPermissionStr(hashMap, "mainDataTableAlias"); + mainDataTable = getPermissionStr(hashMap, "mainDataTable"); + primaryKey = getPermissionStr(hashMap, "primaryKey"); + permissionTargetId = getPermissionStr(hashMap, "permissionTargetId"); + permissionConfigSourceId = getPermissionStr(hashMap, "permissionConfigSourceId"); + + //String columns = getshowColumsStr(showColums); + List list = new ArrayList<>(); + Map countMap = new HashMap<>(); + if (StringUtils.isNotEmpty(permissionId) || StringUtils.isNotEmpty(permissionType) || StringUtils.isNotEmpty(mainDataTableAlias) || StringUtils.isNotEmpty(mainDataTable) || StringUtils.isNotEmpty(permissionTargetId) || StringUtils.isNotEmpty(permissionConfigSourceId)) { + list = localElogDaoMapper.queryElogList(pages, context, null, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey,permissionTargetId,permissionConfigSourceId,"*"); + countMap = localElogDaoMapper.elogCountByMorePermission(context, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey, permissionTargetId,permissionConfigSourceId); + } else { + list = localElogDaoMapper.queryElogList(pages, context, null, tableName, customSql,"*"); + long l1 = System.currentTimeMillis(); + logger.info("elog查询列表耗时：{}", (l1 - l)); + countMap = localElogDaoMapper.elogCount(context, tableName, customSql); + long l2 = System.currentTimeMillis(); + logger.info("elog查询总数耗时：{}", (l2 - l1)); + } + list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); + + if (list != null && list.size() > 0) { + //if ("1".equals(pageNum)){ + list.get(0).put("total", ElogSeviceUtils.getLongValue(countMap.get("counts") + "", 0)); + //} + } + transUserInfo(list); + long l3 = System.currentTimeMillis(); + //System.out.println("elog查询名称和头像耗时：{}"+ (l3-l2)); + transfLanguageData(list, showColums); + if (Util.isNotEmpty(transMethod)) { + // 消费到消息,通过MethodHandler调用对应的方法 + MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(transMethod); + if (methodHandler != null) { + try { + methodHandler.execute(list); + } catch (Exception e) { + logger.error("转换出错：" + e); + } + } + + } + long l4 = System.currentTimeMillis(); + logger.info("elog查询转换耗时：{}", (l4 - l3)); + List res = switchString(list); + logger.info("elog查询总耗时：{}", (l4 - l)); + return res; + } + + /** + * 转换数据成多语言,结合前端转 + * + * @param lists + * @param showColums + */ + public static List transfLanguageData(List lists, List showColums) { + if (lists != null && lists.size() > 0) { + for (Map map : lists) { + if (map != null) { + Iterator> iterator = map.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + for (ShowColumsDto showColum : showColums) { + if (StringUtils.isNotBlank(showColum.getColumIndex()) && showColum.isTransfLanguage() && entry.getKey().equals(showColum.getColumIndex()) && !Objects.isNull(entry.getValue()) && StringUtils.isNumeric(entry.getValue().toString())) { + if (entry.getValue() instanceof Integer || entry.getValue() instanceof Long || entry.getValue() instanceof String) { + map.put(entry.getKey(), ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(entry.getValue().toString()), entry.getValue().toString())); + } else { + //map.put(entry.getKey(), ElogSeviceSwitchUtils.handlerBaseDataMethod(entry.getValue().toString())); + map.put(entry.getKey(), entry.getValue()); + } + } else if (StringUtils.isNotBlank(showColum.getColumIndex()) && showColum.isTransfLanguage() && entry.getKey().equals(showColum.getColumIndex()) && !Objects.isNull(entry.getValue())) { + //read view add edit update delete + if ("add".equals(entry.getValue().toString()) || "创建".equals(entry.getValue().toString())) { + map.put(entry.getKey(), SystemEnv.getHtmlLabelName(63252, "新增")); + } else if ("read".equals(entry.getValue().toString()) || "view".equals(entry.getValue().toString()) || "查看".equals(entry.getValue().toString())) { + map.put(entry.getKey(), SystemEnv.getHtmlLabelName(55172, "查看")); + } else if ("edit".equals(entry.getValue().toString()) || "update".equals(entry.getValue().toString()) || "更新".equals(entry.getValue().toString())) { + map.put(entry.getKey(), SystemEnv.getHtmlLabelName(63253, "修改")); + } else if ("delete".equals(entry.getValue().toString()) || "删除".equals(entry.getValue().toString()) ) { + map.put(entry.getKey(), SystemEnv.getHtmlLabelName(63254, "删除")); + } else if (entry.getValue().toString().contains("取消关联标签 ")) { + String val = entry.getValue().toString().replace("取消关联标签 ", SystemEnv.getHtmlLabelName(83237, "取消关联标签 ") + " "); + map.put(entry.getKey(), val); + } else if (entry.getValue().toString().contains("关联标签 ")) { + String val = entry.getValue().toString().replace("关联标签 ", SystemEnv.getHtmlLabelName(83236, "关联标签 ") + " "); + map.put(entry.getKey(), val); + } + } + } + } + } + } + } + return lists; + } + + + @Override + public Map countLog(String module, String function) { + LoggerContext context = new LoggerContext(); + context.setModuleName(module); + context.setFunctionName(function); + context.setTenant_key(getTenantKey()); + String tableName = ElogSeviceUtils.getTableName(module, function); + return localElogDaoMapper.elogCount(context, tableName, null); + } + + @Override + public List queryDetailLogList(String module, String function, String current, String pageSize, String condition, String mainId) { + LoggerContext context = new LoggerContext(); + context.setModuleName(module); + context.setFunctionName(function); + context.setTenant_key(getTenantKey()); + context.setUuid(mainId); + int page = Util.getIntValue(current, 1) - 1; + int size = Util.getIntValue(pageSize, 10); + int start = page * size; + int end = start + size; + String limit = " limit " + start + "," + (end - start); + // 还需要支持下查询 + String tableName = ElogSeviceUtils.getTableName(module, function, true); + List list = localElogDaoMapper.queryDetailElogList(context, limit, tableName, null); + list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); + return switchString(list); + } + + @Override + public Map countDestailLog(String module, String function, String mainId) { + LoggerContext context = new LoggerContext(); + context.setModuleName(module); + context.setFunctionName(function); + context.setTenant_key(getTenantKey()); + context.setUuid(mainId); + String tableName = ElogSeviceUtils.getTableName(module, function, true); + return localElogDaoMapper.elogDetailCount(context, tableName, null); + } + + @Override + public WeaTable queryElogTraceInfo(String traceId, String module, String function, Integer currentPage, Integer pageSize, String traceTransMethod) { + WeaTable weaTable = new WeaTable(); + if (StringUtils.isNotEmpty(traceId)) { + String tableName = ElogSeviceUtils.getTableName(module, function); + Integer offset = (currentPage - 1) * pageSize; + List list = localElogDaoMapper.queryElogTraceInfo(traceId, tableName, offset, pageSize); + for (Map map : list) { + if (map.get("modulename") != null) { + map.put("modulenamespan", ElogSeviceSwitchUtils.getModuleName(map.get("modulename").toString())); + } + } + //list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); + int count = localElogDaoMapper.queryElogTraceInfoCount(traceId, tableName); + weaTable.setTotal(count); + Page page = new Page(); + page.setTotal(count); + page.setSize(pageSize); + page.setCurrent(currentPage); + weaTable.setPage(page); + if (Util.isNotEmpty(traceTransMethod)) { + // 消费到消息,通过MethodHandler调用对应的方法 + MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(traceTransMethod); + if (methodHandler != null) { + try { + methodHandler.execute(list); + } catch (Exception e) { + logger.error("转换出错：" + e); + } + } + } + weaTable.setData(list); + } + + return weaTable; + } + + @Override + public List queryLogInfoByCustom(String module, String function, String field, String value, boolean isDetail) { + List list = new ArrayList(); + String tableName = ElogSeviceUtils.getTableName(module, function, isDetail); + if (StringUtils.isNotBlank(field) && StringUtils.isNotBlank(value)) { + StringBuffer sql = new StringBuffer(); + sql.append(field).append(" = '").append(value).append("' "); + + list = localElogDaoMapper.queryLogInfoByCustom(tableName, sql.toString()); + } + return list; + } + + + @Override + public List queryLogInfoByCustom(String module, String function, String field, String value) { + return queryLogInfoByCustom(module, function, field, value, false); + } + + public List switchString(List list) { + if (list != null) { + return list.stream().map(m -> { + Set en = m.entrySet(); + for (Map.Entry entry : en) { + if (entry.getValue() != null) { + entry.setValue(String.valueOf(entry.getValue())); + } + } + return m; + }).collect(Collectors.toList()); + } else { + return list; + } + } + + @Override + public BatchDocumentMessage downloadLog(String data) { + JSONObject jsonObject = JSONObject.parseObject(data); + String module = jsonObject.getString("downloadmodule"); + String function = jsonObject.getString("function"); + String serviceName = jsonObject.getString("serviceName"); + String fileName = jsonObject.getString("fileName"); + String passWord = jsonObject.getString("passWord"); + + if (StringUtils.isEmpty(fileName)) { + fileName = SystemEnv.getHtmlLabelName(191432,"日志记录"); + } + + BatchDocumentMessage batchDocumentMessage = new BatchDocumentMessage(); + WeaTable weaTable = queryLogs(data); + List columns = weaTable.getColumns(); + List headers = new ArrayList<>(); + if (columns != null && !columns.isEmpty()) { + for (WeaTableColumn column : columns) { + Map header = new HashMap<>(); + header.put("key", column.getDataIndex()); + header.put("name", column.getTitle()); + headers.add(header); + } + } + List> dataList = weaTable.getData(); + List> maps = new ArrayList<>(); + if (dataList != null && !dataList.isEmpty()) { + dataList.stream().forEach(m -> { + Map map = new HashMap<>(); + headers.stream().forEach(h -> { + map.put(h.get("key").toString(), m.get(h.get("key"))); + }); + maps.add(map); + }); + } + + //必传--业务id + batchDocumentMessage.setBizId(IdGenerator.generate() + ""); + //必传-处理名称 + batchDocumentMessage.setHandlerName("ebatchdemo"); + //必传-服务名称 + batchDocumentMessage.setServiceName(serviceName); + //必传-数据类型 + batchDocumentMessage.setDataType(fileName); + //任务id + batchDocumentMessage.setBatchTaskId(IdGenerator.generate()); + //必传-模块 + batchDocumentMessage.setModule(module); //com.weaver.teams.domain.EntityType 中的module（没有的话需要找温明刚维护下） + //必传-功能 + batchDocumentMessage.setFunction(function); + //必传-eteamsid + batchDocumentMessage.setEteamsId(TenantRpcContext.getEteamsId()); + + //非必传 + if (StringUtils.isNotBlank(passWord)) { + batchDocumentMessage.setPassword(passWord); + } + + //必传 + BatchFile batchFile = new BatchFile(); + batchFile.setName(fileName); + //必传 + batchFile.setFileType(FileType.EXCEL); + //必传 + batchFile.setHandlerFileMethod(HandlerFileMethod.HANDLER_EXCEL_WITH_DATA); + batchFile.setTemplateId(1l); + List excelSheets = new ArrayList<>(); + ExcelSheet excelSheet = new ExcelSheet(); + + excelSheet.setHeader(headers); + excelSheet.setData(maps); + excelSheet.setName(fileName); + excelSheets.add(excelSheet); + batchFile.setExcelSheets(excelSheets); + batchDocumentMessage.setBatchFile(batchFile); + batchDocumentMessage.setChunk(false);//不分片 + batchExportSender.sendBatchExport(batchDocumentMessage); + + return batchDocumentMessage; + } + + public Boolean checkEsTableIsExist(String date) { + try { + String esMainIndex = getElogESTableName(true, date); + //先检查表是否存在 不存在则创建 + boolean existsLog = isExistsIndex(esMainIndex); + return existsLog; + } catch (Exception e) { + logger.info("创建相关ES表失败:{}", e.getMessage(), e); + } + return false; + } + + /** + * 判断一个索引是否存在 + * + * @param indexName + * @return + */ + public boolean isExistsIndex(String indexName) { + GetIndexRequest request = new GetIndexRequest(); + try { + boolean exists = restHighLevelClient.indices().exists(request.indices(indexName), RequestOptions.DEFAULT); + return exists; + } catch (Exception e) { + logger.info("判断索引是否存在出现异常:{}", e.getMessage()); + + } + return false; + } + + /** + * 创建主表语句 + * + * @throws IOException + */ + private void createLogIndex(String esMainIndex) { + // 1.创建Request对象 + CreateIndexRequest request = new CreateIndexRequest(esMainIndex); + // 2.准备请求的参数：DSL语句 + request.source(MAPPING_TEMPLATE, XContentType.JSON); + // 3.发送请求 + try { + restHighLevelClient.indices().create(request, RequestOptions.DEFAULT); + } catch (IOException e) { + logger.info("创建ES主表失败:{}", e.getMessage()); + + } + } + + private String getElogESTableName(boolean flag, String date) { + String currentDate = ""; + if (StringUtils.isEmpty(date)) { + currentDate = DateUtils.getCurrentDate().replaceAll("-", ""); + } else { + currentDate = date.replaceAll("-", ""); + } + return getEsMainIndex(flag, currentDate); + } + + private String getEsMainIndex(boolean flag, String date) { + if (flag) { + return ElogEsTableConsts.ELOG_CENTER_LOGS_ES + date; + } + return ElogEsTableConsts.ELOG_CENTER_LOGSDETAIL_ES + date; + } + + private String[] getESfields(String value) { + String[] split = value.split(","); + List list = new ArrayList<>(); + for (String s : split) { + switch (s.toLowerCase()) { + case "interfacename": + list.add("interfacename"); + break; + case "operatetype": + list.add("operatetype"); + break; + case "operatedesc": + list.add("operatedesc"); + break; + case "params": + list.add("params"); + break; + case "clientip": + list.add("clientip"); + break; + case "groupnamelabel": + list.add("groupnamelabel"); + break; + case "redoservice": + list.add("redoservice"); + break; + case "redocontext": + list.add("redocontext"); + break; + case "cancelservice": + list.add("cancelservice"); + break; + case "cancelcontext": + list.add("cancelcontext"); + break; + case "device": + list.add("device"); + break; + case "groupid": + list.add("groupid"); + break; + case "belongmainid": + list.add("belongmainid"); + break; + case "requesturl": + list.add("requesturl"); + break; + case "requesturi": + list.add("requesturi"); + break; + case "log_result": + list.add("logResult"); + break; + case "fromterminal": + list.add("fromterminal"); + break; + case "resultdesc": + list.add("resultdesc"); + break; + case "old_content": + list.add("oldContent"); + break; + case "link_type": + list.add("linkType"); + break; + } + } + //list转为数组 + if (list.size() > 0) { + String[] strings = list.toArray(new String[list.size()]); + return strings; + } + return null; + } + +} diff --git a/src/com/engine/salary/elog/util/ElogServiceUtils.java b/src/com/engine/salary/elog/util/ElogServiceUtils.java new file mode 100644 index 000000000..1e7428366 --- /dev/null +++ b/src/com/engine/salary/elog/util/ElogServiceUtils.java @@ -0,0 +1,92 @@ +package com.engine.salary.elog.util; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.engine.salary.elog.dto.ElogBean; +import com.engine.salary.elog.dto.FilterConditionDto; +import com.engine.salary.elog.dto.ShowColumsDto; +import com.engine.salary.elog.enums.ElogConsts; + +import java.util.List; +import java.util.Map; + +/** + * @Date: 2022/5/18 19:19 + * @Author: deli.xu + * @Description: elog服务工具类 + **/ +public class ElogServiceUtils { + + public static String getTableName(String module, String function) { + return getTableName(module, function, false); + } + + public static String getTableName(String module, String function, boolean isDetail) { + String tablename = module + ElogConsts.TABLE_SPACER + function + ElogConsts.TABLE_SUFFIX + (isDetail ? ElogConsts.DETAIL_TABLE_SUFFIX : ""); + sqlCheck(tablename); + return tablename; + } + + public static void sqlCheck(String value) { + if (value != null) { + if (!value.matches("^[A-Za-z][a-zA-Z0-9_\\.,]{0,31}$")) { + throw new RuntimeException("sqlCheck failed ! value :" + value); + } + } + } + + public static ElogBean getElogBean(String data) { + JSONObject datas = JSONObject.parseObject(data); + ElogBean elogBean = new ElogBean(); + String module = datas.getString("module"); + String function = datas.getString("function"); + String pageNum = datas.getString("pageNum"); + String pageSize = datas.getString("pageSize"); + String searchMap = datas.getString("searchMap"); + String transMethod = datas.getString("transMethod"); + String authParams = datas.getString("authParams"); + String showColums = datas.getString("showColums"); + String filterConditions = datas.getString("filterConditions"); + String downloadSize = datas.getString("downloadSize"); + List showColumsDtos = JSONArray.parseArray(showColums, ShowColumsDto.class); + List filterConditionDtos = JSONArray.parseArray(filterConditions, FilterConditionDto.class); + Map authParamsJson = JSONObject.parseObject(authParams); + elogBean.setModule(module); + elogBean.setFunction(function); + elogBean.setPageNum(pageNum); + elogBean.setPageSize(pageSize); + elogBean.setSearchMap(searchMap); + elogBean.setTransMethod(transMethod); + elogBean.setDownloadSize(downloadSize); + elogBean.setShowColumns(showColumsDtos); + elogBean.setFilterConditionDtos(filterConditionDtos); + elogBean.setAuthParamsJson(authParamsJson); + return elogBean; + } + + public static int getIntValue(String v) { + return getIntValue(v, -1); + } + + public static int getIntValue(String v, int def) { + try { + return Integer.parseInt(v); + } catch (Exception var3) { + return def; + } + } + + public static long getLongValue(String v) { + return getLongValue(v, -1l); + } + + public static long getLongValue(String v, long def) { + try { + return Long.parseLong(v); + } catch (Exception var3) { + return def; + } + } + + +} diff --git a/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java b/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java new file mode 100644 index 000000000..f6d55aece --- /dev/null +++ b/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java @@ -0,0 +1,1394 @@ +//package com.engine.salary.elog.util; +// +//import cn.hutool.core.map.CaseInsensitiveMap; +//import com.alibaba.druid.proxy.jdbc.ClobProxyImpl; +//import com.alibaba.fastjson.JSON; +//import com.alibaba.fastjson.JSONArray; +//import com.alibaba.fastjson.JSONObject; +//import com.weaver.common.component.table.WeaTable; +//import com.weaver.common.component.table.column.WeaTableColumn; +//import com.weaver.common.elog.annotation.OperateType; +//import com.weaver.common.elog.enums.ElogConsts; +//import com.weaver.common.i18n.label.SystemEnv; +//import com.weaver.common.mybatis.util.DatabaseUtil; +//import com.weaver.common.security.util.SecurityUtil; +//import org.apache.commons.lang3.StringUtils; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +// +//import java.sql.Clob; +//import java.util.*; +//import java.util.regex.Matcher; +//import java.util.regex.Pattern; +// +///** +// * @Date: 2022/5/18 19:34 +// * @Author: deli.xu +// * @Description: elog服务转换类 +// **/ +//public class ElogSeviceSwitchUtils { +// +// private static final Logger logger = LoggerFactory.getLogger(ElogSeviceSwitchUtils.class); +// // TODO 后续需要考虑多语言label写法 +// public static final Map moduleMap = new HashMap<>(); +// +// private static final Map> moduleFuctionMap = new HashMap<>(); +// +// static { +// /*moduleMap.put("elog", SystemEnv.getHtmlLabelName(62975, ElogSeviceUtils.currentLanguage(), "日志")); +// moduleMap.put("report", SystemEnv.getHtmlLabelName(62976, ElogSeviceUtils.currentLanguage(), "报表")); +// moduleMap.put("edc", SystemEnv.getHtmlLabelName(62977, ElogSeviceUtils.currentLanguage(), "数据中心")); +// moduleMap.put("hrm", SystemEnv.getHtmlLabelName(62978, ElogSeviceUtils.currentLanguage(), "人力资源")); +// moduleMap.put("crm", SystemEnv.getHtmlLabelName(62979, ElogSeviceUtils.currentLanguage(), "资产")); +// moduleMap.put("demo", SystemEnv.getHtmlLabelName(62980, ElogSeviceUtils.currentLanguage(), "示例")); +// moduleMap.put("attc", SystemEnv.getHtmlLabelName(62981, ElogSeviceUtils.currentLanguage(), "出勤打卡")); +// moduleMap.put("attm", SystemEnv.getHtmlLabelName(62982, ElogSeviceUtils.currentLanguage(), "出勤机")); +// moduleMap.put("attw", SystemEnv.getHtmlLabelName(62983, ElogSeviceUtils.currentLanguage(), "出勤报表")); +// moduleMap.put("auth", SystemEnv.getHtmlLabelName(62984, ElogSeviceUtils.currentLanguage(), "系统权限")); +// moduleMap.put("bank", SystemEnv.getHtmlLabelName(62985, ElogSeviceUtils.currentLanguage(), "银企直联")); +// moduleMap.put("bap", SystemEnv.getHtmlLabelName(62986, ElogSeviceUtils.currentLanguage(), "云办公")); +// moduleMap.put("base", SystemEnv.getHtmlLabelName(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); +// moduleMap.put("batc", SystemEnv.getHtmlLabelName(62988, ElogSeviceUtils.currentLanguage(), "导入导出")); +// moduleMap.put("blog", SystemEnv.getHtmlLabelName(62989, ElogSeviceUtils.currentLanguage(), "日报微博")); +// moduleMap.put("cld", SystemEnv.getHtmlLabelName(62990, ElogSeviceUtils.currentLanguage(), "日程管理")); +// moduleMap.put("cmca", SystemEnv.getHtmlLabelName(62991, ElogSeviceUtils.currentLanguage(), "资金管理")); +// moduleMap.put("cmcl", SystemEnv.getHtmlLabelName(62992, ElogSeviceUtils.currentLanguage(), "线索管理")); +// moduleMap.put("cmco", SystemEnv.getHtmlLabelName(62993, ElogSeviceUtils.currentLanguage(), "联系人管理")); +// moduleMap.put("cmcp", SystemEnv.getHtmlLabelName(62994, ElogSeviceUtils.currentLanguage(), "对手管理")); +// moduleMap.put("cmcu", SystemEnv.getHtmlLabelName(62995, ElogSeviceUtils.currentLanguage(), "客户管理")); +// moduleMap.put("cmex", SystemEnv.getHtmlLabelName(62996, ElogSeviceUtils.currentLanguage(), "批量操作")); +// moduleMap.put("cmmk", SystemEnv.getHtmlLabelName(62997, ElogSeviceUtils.currentLanguage(), "营销管理")); +// moduleMap.put("cmor", SystemEnv.getHtmlLabelName(62998, ElogSeviceUtils.currentLanguage(), "订单管理")); +// moduleMap.put("cmpc", SystemEnv.getHtmlLabelName(62999, ElogSeviceUtils.currentLanguage(), "价格管理")); +// moduleMap.put("cmpr", SystemEnv.getHtmlLabelName(63000, ElogSeviceUtils.currentLanguage(), "产品管理")); +// moduleMap.put("cmpt", SystemEnv.getHtmlLabelName(63001, ElogSeviceUtils.currentLanguage(), "外部门户")); +// moduleMap.put("cmqu", SystemEnv.getHtmlLabelName(63002, ElogSeviceUtils.currentLanguage(), "报价管理")); +// moduleMap.put("cmsa", SystemEnv.getHtmlLabelName(63003, ElogSeviceUtils.currentLanguage(), "商机管理")); +// moduleMap.put("cmtr", SystemEnv.getHtmlLabelName(63004, ElogSeviceUtils.currentLanguage(), "合同管理")); +// moduleMap.put("comp", SystemEnv.getHtmlLabelName(63005, ElogSeviceUtils.currentLanguage(), "文档对比")); +// moduleMap.put("cs", SystemEnv.getHtmlLabelName(63006, ElogSeviceUtils.currentLanguage(), "云商店")); +// moduleMap.put("cowork", SystemEnv.getHtmlLabelName(63007, ElogSeviceUtils.currentLanguage(), "协作区")); +// moduleMap.put("dbs", SystemEnv.getHtmlLabelName(63008, ElogSeviceUtils.currentLanguage(), "文档公共模块")); +// moduleMap.put("dcad", SystemEnv.getHtmlLabelName(63009, ElogSeviceUtils.currentLanguage(), "数据中心运行")); +// moduleMap.put("dcap", SystemEnv.getHtmlLabelName(63010, ElogSeviceUtils.currentLanguage(), "数据中心分析开发配置")); +// moduleMap.put("dcrd", SystemEnv.getHtmlLabelName(63011, ElogSeviceUtils.currentLanguage(), "数据中心开发配置")); +// moduleMap.put("dcre", SystemEnv.getHtmlLabelName(63012, ElogSeviceUtils.currentLanguage(), "数据中心分析生产运行")); +// moduleMap.put("dcs", SystemEnv.getHtmlLabelName(63013, ElogSeviceUtils.currentLanguage(), "文档目录模块")); +// moduleMap.put("dds", SystemEnv.getHtmlLabelName(63014, ElogSeviceUtils.currentLanguage(), "文档模块")); +// moduleMap.put("dps", SystemEnv.getHtmlLabelName(63015, ElogSeviceUtils.currentLanguage(), "文档权限模块")); +// moduleMap.put("drle", SystemEnv.getHtmlLabelName(63016, ElogSeviceUtils.currentLanguage(), "数据规则库")); +// moduleMap.put("ds", SystemEnv.getHtmlLabelName(63017, ElogSeviceUtils.currentLanguage(), "数据安全")); +// moduleMap.put("dw_etl", SystemEnv.getHtmlLabelName(63018, ElogSeviceUtils.currentLanguage(), "ETL(抽取，转换，治理）")); +// moduleMap.put("dw_model", SystemEnv.getHtmlLabelName(63019, ElogSeviceUtils.currentLanguage(), "建模服务")); +// moduleMap.put("dw_process", SystemEnv.getHtmlLabelName(63020, ElogSeviceUtils.currentLanguage(), "计算服务")); +// moduleMap.put("dw_search", SystemEnv.getHtmlLabelName(63021, ElogSeviceUtils.currentLanguage(), "查询服务")); +// moduleMap.put("dw_sync", SystemEnv.getHtmlLabelName(63022, ElogSeviceUtils.currentLanguage(), "数据抽取")); +// moduleMap.put("eb", SystemEnv.getHtmlLabelName(63023, ElogSeviceUtils.currentLanguage(), "云桥")); +// moduleMap.put("ebda", SystemEnv.getHtmlLabelName(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); +// moduleMap.put("ebdd", SystemEnv.getHtmlLabelName(63024, ElogSeviceUtils.currentLanguage(), "页面设计")); +// moduleMap.put("ebdf", SystemEnv.getHtmlLabelName(63025, ElogSeviceUtils.currentLanguage(), "表单服务")); +// moduleMap.put("ebdp", SystemEnv.getHtmlLabelName(63026, ElogSeviceUtils.currentLanguage(), "页面管理")); +// moduleMap.put("ecod", SystemEnv.getHtmlLabelName(63027, ElogSeviceUtils.currentLanguage(), "ecode")); +// moduleMap.put("ei", SystemEnv.getHtmlLabelName(63028, ElogSeviceUtils.currentLanguage(), "数据导出导入")); +// moduleMap.put("em", SystemEnv.getHtmlLabelName(63029, ElogSeviceUtils.currentLanguage(), "移动相关")); +// moduleMap.put("es", SystemEnv.getHtmlLabelName(63030, ElogSeviceUtils.currentLanguage(), "微搜搜索")); +// moduleMap.put("esa", SystemEnv.getHtmlLabelName(63031, ElogSeviceUtils.currentLanguage(), "微搜文件分析")); +// moduleMap.put("esb", SystemEnv.getHtmlLabelName(63032, ElogSeviceUtils.currentLanguage(), "ESB")); +// moduleMap.put("esch", SystemEnv.getHtmlLabelName(63033, ElogSeviceUtils.currentLanguage(), "计划任务")); +// moduleMap.put("esd", SystemEnv.getHtmlLabelName(63034, ElogSeviceUtils.currentLanguage(), "微搜索引数据")); +// moduleMap.put("exfo", SystemEnv.getHtmlLabelName(63035, ElogSeviceUtils.currentLanguage(), "excel函数引擎")); +// moduleMap.put("fbdg", SystemEnv.getHtmlLabelName(63036, ElogSeviceUtils.currentLanguage(), "预算编制")); +// moduleMap.put("fdt", SystemEnv.getHtmlLabelName(63037, ElogSeviceUtils.currentLanguage(), "表单数据")); +// moduleMap.put("fexs", SystemEnv.getHtmlLabelName(63038, ElogSeviceUtils.currentLanguage(), "费用管理")); +// moduleMap.put("file", SystemEnv.getHtmlLabelName(63039, ElogSeviceUtils.currentLanguage(), "文件服务")); +// moduleMap.put("finc", SystemEnv.getHtmlLabelName(63040, ElogSeviceUtils.currentLanguage(), "微报账")); +// moduleMap.put("fnar", SystemEnv.getHtmlLabelName(63041, ElogSeviceUtils.currentLanguage(), "财务报表")); +// moduleMap.put("fomo", SystemEnv.getHtmlLabelName(63042, ElogSeviceUtils.currentLanguage(), "表单监控")); +// moduleMap.put("form", SystemEnv.getHtmlLabelName(63043, ElogSeviceUtils.currentLanguage(), "表单服务")); +// moduleMap.put("frpt", SystemEnv.getHtmlLabelName(63043, ElogSeviceUtils.currentLanguage(), "业务表单")); +// moduleMap.put("fvou", SystemEnv.getHtmlLabelName(63044, ElogSeviceUtils.currentLanguage(), "凭证集成")); +// moduleMap.put("hp", SystemEnv.getHtmlLabelName(63045, ElogSeviceUtils.currentLanguage(), "门户")); +// moduleMap.put("hr", SystemEnv.getHtmlLabelName(63046, ElogSeviceUtils.currentLanguage(), "人事档案")); +// moduleMap.put("ic", SystemEnv.getHtmlLabelName(63047, ElogSeviceUtils.currentLanguage(), "集成服务")); +// moduleMap.put("il", SystemEnv.getHtmlLabelName(63048, ElogSeviceUtils.currentLanguage(), "集成登录")); +// moduleMap.put("im", SystemEnv.getHtmlLabelName(63049, ElogSeviceUtils.currentLanguage(), "IM相关服务")); +// moduleMap.put("inc", SystemEnv.getHtmlLabelName(63050, ElogSeviceUtils.currentLanguage(), "发票云服务")); +// moduleMap.put("iua", SystemEnv.getHtmlLabelName(63051, ElogSeviceUtils.currentLanguage(), "统一认证")); +// moduleMap.put("iut", SystemEnv.getHtmlLabelName(63052, ElogSeviceUtils.currentLanguage(), "统一待办")); +// moduleMap.put("mail", SystemEnv.getHtmlLabelName(63053, ElogSeviceUtils.currentLanguage(), "邮件服务")); +// moduleMap.put("mc", SystemEnv.getHtmlLabelName(63054, ElogSeviceUtils.currentLanguage(), "消息服务")); +// moduleMap.put("mt", SystemEnv.getHtmlLabelName(63055, ElogSeviceUtils.currentLanguage(), "会议管理")); +// moduleMap.put("my", SystemEnv.getHtmlLabelName(63056, ElogSeviceUtils.currentLanguage(), "关注&收藏&标签")); +// moduleMap.put("odoc", SystemEnv.getHtmlLabelName(63057, ElogSeviceUtils.currentLanguage(), "公文管理")); +// moduleMap.put("odoc_exchange", SystemEnv.getHtmlLabelName(63058, ElogSeviceUtils.currentLanguage(), "公文交换平台")); +// moduleMap.put("open", SystemEnv.getHtmlLabelName(63059, ElogSeviceUtils.currentLanguage(), "开放平台")); +// moduleMap.put("pr", SystemEnv.getHtmlLabelName(63060, ElogSeviceUtils.currentLanguage(), "工作画像")); +// moduleMap.put("proj", SystemEnv.getHtmlLabelName(63061, ElogSeviceUtils.currentLanguage(), "项目管理")); +// moduleMap.put("prt", SystemEnv.getHtmlLabelName(63062, ElogSeviceUtils.currentLanguage(), "打印服务")); +// moduleMap.put("pspt", SystemEnv.getHtmlLabelName(63063, ElogSeviceUtils.currentLanguage(), "系统登录")); +// moduleMap.put("rptc", SystemEnv.getHtmlLabelName(63064, ElogSeviceUtils.currentLanguage(), "数据协作")); +// moduleMap.put("rpts", SystemEnv.getHtmlLabelName(63065, ElogSeviceUtils.currentLanguage(), "上报调查")); +// moduleMap.put("sala", SystemEnv.getHtmlLabelName(63066, ElogSeviceUtils.currentLanguage(), "薪资管理")); +// moduleMap.put("sign", SystemEnv.getHtmlLabelName(63067, ElogSeviceUtils.currentLanguage(), "印控中心")); +// moduleMap.put("sms", SystemEnv.getHtmlLabelName(63068, ElogSeviceUtils.currentLanguage(), "短信")); +// moduleMap.put("task", SystemEnv.getHtmlLabelName(63069, ElogSeviceUtils.currentLanguage(), "任务管理")); +// moduleMap.put("tnt", SystemEnv.getHtmlLabelName(63070, ElogSeviceUtils.currentLanguage(), "租户管理")); +// moduleMap.put("wf", SystemEnv.getHtmlLabelName(63071, ElogSeviceUtils.currentLanguage(), "路径定义")); +// moduleMap.put("wfc", SystemEnv.getHtmlLabelName(63072, ElogSeviceUtils.currentLanguage(), "流程流转")); +// moduleMap.put("wfr", SystemEnv.getHtmlLabelName(63073, ElogSeviceUtils.currentLanguage(), "流程规则路由")); +// moduleMap.put("wrgm", SystemEnv.getHtmlLabelName(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); +// moduleMap.put("wrgp", SystemEnv.getHtmlLabelName(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); +// moduleMap.put("wrpr", SystemEnv.getHtmlLabelName(63076, ElogSeviceUtils.currentLanguage(), "计划报告")); +// moduleMap.put("doc", SystemEnv.getHtmlLabelName(63077, ElogSeviceUtils.currentLanguage(), "文档服务")); +// moduleMap.put("placard", SystemEnv.getHtmlLabelName(63078, ElogSeviceUtils.currentLanguage(), "团队公告")); +// moduleMap.put("fna", SystemEnv.getHtmlLabelName(135042, ElogSeviceUtils.currentLanguage(), "云报销")); +// moduleMap.put("meeting", SystemEnv.getHtmlLabelName(63080, ElogSeviceUtils.currentLanguage(), "会议")); +// moduleMap.put("wfp", SystemEnv.getHtmlLabelName(63081, ElogSeviceUtils.currentLanguage(), "流程")); +// moduleMap.put("portal", SystemEnv.getHtmlLabelName(63045, ElogSeviceUtils.currentLanguage(), "门户")); +// moduleMap.put("workreport", SystemEnv.getHtmlLabelName(63082, ElogSeviceUtils.currentLanguage(), "工作报告")); +// moduleMap.put("goal", SystemEnv.getHtmlLabelName(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); +// moduleMap.put("performance", SystemEnv.getHtmlLabelName(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); +// moduleMap.put("intlogin", SystemEnv.getHtmlLabelName(63083, ElogSeviceUtils.currentLanguage(), "集成登录设置")); +// moduleMap.put("i18n", SystemEnv.getHtmlLabelName(64559, ElogSeviceUtils.currentLanguage(), "国际化")); +// moduleMap.put("timecard", SystemEnv.getHtmlLabelName(63085, ElogSeviceUtils.currentLanguage(), "出勤")); +// moduleMap.put("market", SystemEnv.getHtmlLabelName(63086, ElogSeviceUtils.currentLanguage(), "营销")); +// moduleMap.put("excelformula", SystemEnv.getHtmlLabelName(64560, ElogSeviceUtils.currentLanguage(), "函数服务")); +// moduleMap.put("ic_ldap", SystemEnv.getHtmlLabelName(70081, ElogSeviceUtils.currentLanguage(), "Ldap集成")); +// moduleMap.put("iut_c_c", SystemEnv.getHtmlLabelName(70303, ElogSeviceUtils.currentLanguage(), "统一待办推送设置")); +// moduleMap.put("plan", SystemEnv.getHtmlLabelName(70303, ElogSeviceUtils.currentLanguage(), "计划报告")); +// moduleMap.put("document", SystemEnv.getHtmlLabelName(34218, ElogSeviceUtils.currentLanguage(), "文档")); +// moduleMap.put("taskCustStatus", SystemEnv.getHtmlLabelName(73988, ElogSeviceUtils.currentLanguage(), "任务状态")); +// moduleMap.put("project", SystemEnv.getHtmlLabelName(55158, ElogSeviceUtils.currentLanguage(), "项目")); +// moduleMap.put("calendar", SystemEnv.getHtmlLabelName(74186, ElogSeviceUtils.currentLanguage(), "日历")); +// moduleMap.put("web", SystemEnv.getHtmlLabelName(75598, ElogSeviceUtils.currentLanguage(), "浏览")); +// moduleMap.put("formdatareport", SystemEnv.getHtmlLabelName(76068, ElogSeviceUtils.currentLanguage(), "来自上报数据")); +// moduleMap.put("mainline", SystemEnv.getHtmlLabelName(31898, ElogSeviceUtils.currentLanguage(), "主线")); +// moduleMap.put("customer", SystemEnv.getHtmlLabelName(32726, ElogSeviceUtils.currentLanguage(), "客户")); +// moduleMap.put("contract", SystemEnv.getHtmlLabelName(32864, ElogSeviceUtils.currentLanguage(), "合同")); +// moduleMap.put("group", SystemEnv.getHtmlLabelName(19426, ElogSeviceUtils.currentLanguage(), "分组")); +// moduleMap.put("workflow", SystemEnv.getHtmlLabelName(81851, ElogSeviceUtils.currentLanguage(), "工作流程")); +// moduleMap.put("biaoge", SystemEnv.getHtmlLabelName(30919, ElogSeviceUtils.currentLanguage(), "表格")); +// moduleMap.put("clue", SystemEnv.getHtmlLabelName(28908, ElogSeviceUtils.currentLanguage(), "线索")); +// moduleMap.put("competitor", SystemEnv.getHtmlLabelName(81852, ElogSeviceUtils.currentLanguage(), "竞争对手")); +// moduleMap.put("kpiFlow", SystemEnv.getHtmlLabelName(81853, ElogSeviceUtils.currentLanguage(), "kpil流程")); +// moduleMap.put("mainlineCustStatus", SystemEnv.getHtmlLabelName(81854, ElogSeviceUtils.currentLanguage(), "主线客户状态")); +// moduleMap.put("marketactivity", SystemEnv.getHtmlLabelName(34221, ElogSeviceUtils.currentLanguage(), "市场活动")); +// moduleMap.put("mtPhase", SystemEnv.getHtmlLabelName(81855, ElogSeviceUtils.currentLanguage(), "mt阶段")); +// moduleMap.put("production", SystemEnv.getHtmlLabelName(29329, ElogSeviceUtils.currentLanguage(), "产品")); +// moduleMap.put("quote", SystemEnv.getHtmlLabelName(34231, ElogSeviceUtils.currentLanguage(), "报价")); +// moduleMap.put("saleChance", SystemEnv.getHtmlLabelName(32863, ElogSeviceUtils.currentLanguage(), "商机")); +// moduleMap.put("orderform", SystemEnv.getHtmlLabelName(34230, ElogSeviceUtils.currentLanguage(), "订单")); +// moduleMap.put("contact", SystemEnv.getHtmlLabelName(32711, ElogSeviceUtils.currentLanguage(), "联系人")); +// moduleMap.put("price", SystemEnv.getHtmlLabelName(31922, ElogSeviceUtils.currentLanguage(), "价格")); +// moduleMap.put("capital", SystemEnv.getHtmlLabelName(83428, ElogSeviceUtils.currentLanguage(), "资金")); +// moduleMap.put("ice", SystemEnv.getHtmlLabelName(94360, ElogSeviceUtils.currentLanguage(), "日程会议集成")); +// moduleMap.put("ic_hr", SystemEnv.getHtmlLabelName(84284, ElogSeviceUtils.currentLanguage(), "HR同步")); +// moduleMap.put("intunifyauth", SystemEnv.getHtmlLabelName(84467, ElogSeviceUtils.currentLanguage(), "统一认证接入管理")); +// moduleMap.put("signcenter", SystemEnv.getHtmlLabelName(84691, ElogSeviceUtils.currentLanguage(), "电子签")); +// moduleMap.put("iut_s_c", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办-异构系统")); +// moduleMap.put("iut_s_c1", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统")); +// moduleMap.put("iut_s_c2", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办中心")); +// moduleMap.put("iut_s_c3", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统-流程类型")); +// moduleMap.put("ic_mail", SystemEnv.getHtmlLabelName(100715, ElogSeviceUtils.currentLanguage(), "邮箱集成")); +// moduleMap.put("hrsa", SystemEnv.getHtmlLabelName(105038, ElogSeviceUtils.currentLanguage(), "薪酬管理")); +// moduleMap.put("icc", SystemEnv.getHtmlLabelName(113884, ElogSeviceUtils.currentLanguage(), "转换规则")); +// moduleMap.put("basicserver", SystemEnv.getHtmlLabelName(113885, ElogSeviceUtils.currentLanguage(), "整体基础")); +// moduleMap.put("dw", SystemEnv.getHtmlLabelName(115549, ElogSeviceUtils.currentLanguage(), "数据仓库")); +// moduleMap.put("msg", SystemEnv.getHtmlLabelName(115563, ElogSeviceUtils.currentLanguage(), "工作消息")); +// moduleMap.put("intunifybase", SystemEnv.getHtmlLabelName(115599, ElogSeviceUtils.currentLanguage(), "统一认证服务")); +// moduleMap.put("esearch", SystemEnv.getHtmlLabelName(21694, ElogSeviceUtils.currentLanguage(), "全文检索")); +// moduleMap.put("iaauthserver", SystemEnv.getHtmlLabelName(115603, ElogSeviceUtils.currentLanguage(), "统一认证注册应用")); +// moduleMap.put("excel", SystemEnv.getHtmlLabelName(115543, ElogSeviceUtils.currentLanguage(), "excel函数")); +// moduleMap.put("scene", SystemEnv.getHtmlLabelName(115539, ElogSeviceUtils.currentLanguage(), "绘图")); +// moduleMap.put("bcw", SystemEnv.getHtmlLabelName(115651, ElogSeviceUtils.currentLanguage(), "公共模块")); +// moduleMap.put("folder", SystemEnv.getHtmlLabelName(10734, ElogSeviceUtils.currentLanguage(), "文件夹")); +// moduleMap.put("pdfcnv", SystemEnv.getHtmlLabelName(115957, ElogSeviceUtils.currentLanguage(), "PDF转换服务")); +// moduleMap.put("ebform", SystemEnv.getHtmlLabelName(121462, ElogSeviceUtils.currentLanguage(), "e-Builder表单")); +// moduleMap.put("statistics", SystemEnv.getHtmlLabelName(17745, ElogSeviceUtils.currentLanguage(), "自定义统计")); +// moduleMap.put("edcapp", SystemEnv.getHtmlLabelName(121631, ElogSeviceUtils.currentLanguage(), "多级填报")); +// +// */ +// +// moduleMap.put("elog", 62975); +// moduleMap.put("report", 62976); +// moduleMap.put("edc", 52689); +// moduleMap.put("hrm", 62978); +// moduleMap.put("crm", 62979); +// moduleMap.put("demo", 62980); +// moduleMap.put("attc", 62981); +// moduleMap.put("attm", 62982); +// moduleMap.put("attw", 62983); +// moduleMap.put("auth", 62984); +// moduleMap.put("bank", 62985); +// moduleMap.put("bap", 62986); +// moduleMap.put("base", 62987); +// moduleMap.put("batc", 62988); +// moduleMap.put("blog", 62989); +// moduleMap.put("cld", 62990); +// moduleMap.put("cmca", 62991); +// moduleMap.put("cmcl", 62992); +// moduleMap.put("cmco", 62993); +// moduleMap.put("cmcp", 62994); +// moduleMap.put("cmcu", 62995); +// moduleMap.put("cmex", 62996); +// moduleMap.put("cmmk", 62997); +// moduleMap.put("cmor", 62998); +// moduleMap.put("cmpc", 62999); +// moduleMap.put("cmpr", 63000); +// moduleMap.put("cmpt", 63001); +// moduleMap.put("cmqu", 63002); +// moduleMap.put("cmsa", 63003); +// moduleMap.put("cmtr", 63004); +// moduleMap.put("comp", 63005); +// moduleMap.put("cs", 63006); +// moduleMap.put("cowork", 63007); +// moduleMap.put("dbs", 63008); +// moduleMap.put("dcad", 63009); +// moduleMap.put("dcap", 63010); +// moduleMap.put("dcrd", 63011); +// moduleMap.put("dcre", 63012); +// moduleMap.put("dcs", 63013); +// moduleMap.put("dds", 63014); +// moduleMap.put("dps", 63015); +// moduleMap.put("drle", 63016); +// moduleMap.put("ds", 63017); +// moduleMap.put("dw_etl", 63018); +// moduleMap.put("dw_model", 63019); +// moduleMap.put("dw_process", 63020); +// moduleMap.put("dw_search", 63021); +// moduleMap.put("dw_sync", 63022); +// moduleMap.put("eb", 63023); +// moduleMap.put("ebda", 62987); +// moduleMap.put("ebdd", 63024); +// moduleMap.put("ebdf", 63025); +// moduleMap.put("ebdp", 63026); +// moduleMap.put("ecod", 63027); +// moduleMap.put("ei", 63028); +// moduleMap.put("em", 63029); +// moduleMap.put("es", 63030); +// moduleMap.put("esa", 63031); +// moduleMap.put("esb", 63032); +// moduleMap.put("esch", 63033); +// moduleMap.put("esd", 63034); +// moduleMap.put("exfo", 63035); +// moduleMap.put("fbdg", 63036); +// moduleMap.put("fdt",63037); +// moduleMap.put("fexs", 63038); +// moduleMap.put("file", 63039); +// moduleMap.put("finc", 63040); +// moduleMap.put("fnar", 63041); +// moduleMap.put("fomo", 63042); +// moduleMap.put("form", 63043); +// moduleMap.put("frpt", 63043); +// moduleMap.put("fvou", 63044); +// moduleMap.put("hp", 63045); +// moduleMap.put("hr", 63046); +// moduleMap.put("ic", 63047); +// moduleMap.put("il", 63048); +// moduleMap.put("im", 63049); +// moduleMap.put("inc", 63050); +// moduleMap.put("iua", 63051); +// moduleMap.put("iut", 63052); +// moduleMap.put("mail", 63053); +// moduleMap.put("mc", 63054); +// moduleMap.put("mt", 63055); +// moduleMap.put("my", 63056); +// moduleMap.put("odoc", 63057); +// moduleMap.put("odoc_exchange", 63058); +// moduleMap.put("open", 63059); +// moduleMap.put("pr", 63060); +// moduleMap.put("proj", 63061); +// moduleMap.put("prt", 63062); +// moduleMap.put("pspt", 63063); +// moduleMap.put("rptc", 63064); +// moduleMap.put("rpts", 63065); +// moduleMap.put("sala", 63066); +// moduleMap.put("sign", 63067); +// moduleMap.put("sms", 63068); +// moduleMap.put("task", 63069); +// moduleMap.put("tnt", 63070); +// moduleMap.put("wf", 63071); +// moduleMap.put("wfc", 63072); +// moduleMap.put("wfr", 63073); +// moduleMap.put("wrgm", 63074); +// moduleMap.put("wrgp", 63075); +// moduleMap.put("wrpr", 63076); +// moduleMap.put("doc", 63077); +// moduleMap.put("placard", 63078); +// moduleMap.put("fna", 135042); +// moduleMap.put("meeting", 63080); +// moduleMap.put("wfp", 63081); +// moduleMap.put("portal", 63045); +// moduleMap.put("workreport", 63082); +// moduleMap.put("goal", 63074); +// moduleMap.put("performance", 63075); +// moduleMap.put("intlogin", 63083); +// moduleMap.put("i18n", 64559); +// moduleMap.put("timecard", 63085); +// moduleMap.put("market", 63086); +// moduleMap.put("excelformula", 64560); +// moduleMap.put("ebatch", 69280); +// moduleMap.put("ic_ldap", 70081); +// moduleMap.put("iut_c_c", 96493); +// moduleMap.put("plan", 63076); +// moduleMap.put("document", 34218); +// moduleMap.put("taskCustStatus", 73988); +// moduleMap.put("calendar", 74186); +// moduleMap.put("batch", 69280); +// moduleMap.put("project", 55158); +// moduleMap.put("web", 75598); +// moduleMap.put("formdatareport", 76068); +// moduleMap.put("mainline", 31898); +// moduleMap.put("customer", 32726); +// moduleMap.put("contract", 32864); +// moduleMap.put("group", 19426); +// moduleMap.put("workflow", 81851); +// moduleMap.put("biaoge", 30919); +// moduleMap.put("clue", 28908); +// moduleMap.put("competitor", 81852); +// moduleMap.put("kpiFlow", 81853); +// moduleMap.put("mainlineCustStatus", 81854); +// moduleMap.put("marketactivity", 34221); +// moduleMap.put("mtPhase", 81855); +// moduleMap.put("production", 29329); +// moduleMap.put("quote", 34231); +// moduleMap.put("saleChance", 32863); +// moduleMap.put("orderform", 34230); +// moduleMap.put("contact", 32711); +// moduleMap.put("price", 31922); +// moduleMap.put("capital", 83428); +// moduleMap.put("ice", 87722); +// moduleMap.put("ic_hr", 84284); +// moduleMap.put("intunifyauth", 84508); +// moduleMap.put("signcenter", 84691); +// moduleMap.put("iut_s_c", 91503); +// moduleMap.put("iut_s_c1", 95218); +// moduleMap.put("iut_s_c2", 95219); +// moduleMap.put("iut_s_c3", 95220); +// moduleMap.put("iut_c_log", 96494); +// moduleMap.put("ic_mail", 100715); +// moduleMap.put("hrsa", 105038); +// moduleMap.put("icc", 113884); +// moduleMap.put("basicserver", 113885); +// moduleMap.put("dw", 115549); +// moduleMap.put("msg", 115563); +// moduleMap.put("intunifybase", 115599); +// moduleMap.put("esearch", 21694); +// moduleMap.put("iaauthserver", 115603); +// moduleMap.put("excel", 115543); +// moduleMap.put("scene", 115539); +// moduleMap.put("bcw", 115651); +// moduleMap.put("folder", 10734); +// moduleMap.put("pdfcnv", 115957); +// moduleMap.put("login", 63063); +// moduleMap.put("ebform", 121462); +// moduleMap.put("statistics", 17745); +// moduleMap.put("edcapp", 121631); +// moduleMap.put("cusapp", 16381); +// moduleMap.put("e10-allinone-base", 141083); +// moduleMap.put("voice", 142713); +// moduleMap.put("filter", 147832); +// moduleMap.put("ias", 146674); +// moduleMap.put("device", 153666); +// moduleMap.put("meetingTopic", 180274); +// moduleMap.put("meetingService", 180276); +// moduleMap.put("meetingDecision", 180277); +// moduleMap.put("meetingSign", 180278); +// moduleMap.put("meetingSignSet", 61601); +// moduleMap.put("meetingMember", 180280); +// moduleMap.put("meetingShare", 180281); +// moduleMap.put("int", 40031); +// moduleMap.put("print", 160051); +// moduleMap.put("wcwIconUpdate", 182661); +// moduleMap.put("wcwIconRelease", 183123); +// moduleMap.put("wcwIconUse", 183124); +// moduleMap.put("wcw", 29385); +// moduleMap.put("component", 115651); +// moduleMap.put("ic_exchange", 87722); +// moduleMap.put("iut_c_c", 240048); +// moduleMap.put("iut_c_set", 240049); +// +// Map elogMap = new HashMap<>(); +// Map reportMap = new HashMap<>(); +// Map edcMap = new HashMap<>(); +// Map hrmMap = new HashMap<>(); +// Map crmMap = new HashMap<>(); +// Map demoMap = new HashMap<>(); +// +// moduleFuctionMap.put("elog", elogMap); +// moduleFuctionMap.put("report", reportMap); +// moduleFuctionMap.put("edc", edcMap); +// moduleFuctionMap.put("hrm", hrmMap); +// moduleFuctionMap.put("crm", crmMap); +// moduleFuctionMap.put("demo", demoMap); +// +// +// +// elogMap.put("operator", "日志操作"); +// elogMap.put("reportcusinfo","报表自定义"); +// edcMap.put("dataset","数据集合"); +// +// demoMap.put("reportcusinfo","报表自定义字段"); +// } +// +// /** +// * 获取模块名称 +// * @param module +// * @return +// */ +// public static String getModuleName(String module) { +// String modulename = ElogSeviceUtils.null2String(moduleMap.get(module), module); +// +// return ElogSeviceUtils.isLongValue(modulename) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(modulename),modulename) : modulename; +// } +// +// /** +// * 获取模块名称 +// * @param module +// * @return +// */ +// public static String getModuleNamePapi(String module) { +// String modulename = ElogSeviceUtils.null2String(moduleMap.get(module), module); +// +// return ElogSeviceUtils.isLongValue(modulename) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(modulename),modulename) : modulename; +// } +// +// +// /** +// * 获取方法名称 +// * @param module +// * @param function +// * @return +// */ +// public static String getFunctionName(String module, String function) { +// Map functionMap = moduleFuctionMap.get(module); +// +// if(functionMap != null) +// function = ElogSeviceUtils.null2String(functionMap.get(function),function); +// +// return ElogSeviceUtils.isLongValue(function) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(function),function) : function; +// } +// +// public static void switchValues(List resultMap, List recordColumns) { +// +// switchValues(resultMap,recordColumns,false); +// +// } +// +// +// public static void switchValues(List list,List recordColumns, boolean islocal) { +//// if(!islocal) { +//// changKey2Lower(list); +//// } +// for(Map map : list) { +// Iterator> iterator = map.entrySet().iterator(); +// while (iterator.hasNext()) { +// Map.Entry next = iterator.next(); +// for (String recordColumn : recordColumns) { +// if (next.getKey().equals(recordColumn) && next.getValue() instanceof String) { +// map.put(next.getKey(), transfi18Method(next.getValue())); +// } +// } +// } +// map.put("modulenamespan", getModuleName(map.get("modulename"))); +// //map.put("functionnamespan", getFunctionName(map.get("modulename"), map.get("functionname"))); +// //switchDatabaseField(map); +// } +// +// } +// +// public static void switchDatabaseField(Map map) { +// map.put("date", map.get("log_date")); +// map.put("operator", map.get("log_operator")); +// map.put("result", map.get("log_result")); +// } +// +// /** +// * 转换数据成多语言 +// * @param lists +// */ +// public static List transfLanguageData(List lists) { +// if (lists != null && lists.size() > 0) { +// for (Map map : lists) { +// if (map != null) { +// Iterator> iterator = map.entrySet().iterator(); +// while (iterator.hasNext()) { +// Map.Entry entry = iterator.next(); +// if (entry.getValue() instanceof Integer ||entry.getValue() instanceof Long||entry.getValue()instanceof String) { +// map.put(entry.getKey(), transfLanguageLableid(ElogSeviceUtils.getLongValue(entry.getValue().toString()),entry.getValue().toString())); +// }else{ +// map.put(entry.getKey(), entry.getValue()); +// } +// } +// } +// } +// } +// return lists; +// } +// +// public static String transfi18Method(String str) { +// if ("新增".equals(str)){ +// return transfLanguageLableid(63252l,str); +// } else if ("查看".equals(str)) { +// return transfLanguageLableid(55172l,str); +// }else if ("修改".equals(str)) { +// return transfLanguageLableid(63253l,str); +// }else if ("更新".equals(str)) { +// return transfLanguageLableid(29540l,str); +// }else if ("删除".equals(str)) { +// return transfLanguageLableid(63254l,str); +// }else if (StringUtils.isNumeric(str) && str.length()< 10) { +// return transfLanguageLableid(Long.parseLong(str),str); +// }else { +// return str; +// } +// } +// +// public static String transfLanguageLableid(Long lableid) { +// return SystemEnv.getHtmlLabelName(lableid, lableid.toString()); +// } +// +// /** +// * 转换多语言 +// * @param lableid +// * @param def +// * @return +// */ +// public static String transfLanguageLableid(Long lableid,String def) { +// return SystemEnv.getHtmlLabelName(lableid, def); +// } +// +// +// /** +// * 日志本地服务-更新明细转换 +// * +// * @param mainlist +// * @param list +// * @return +// */ +// public static Map switchChangeValue(List mainlist, List list) { +// Map res = new HashMap<>(); +// StringBuilder valuesChange = new StringBuilder(); +// List valuesChanges = new ArrayList<>(); +// String values = ""; +// String operatetypeName = ""; +// int oldCount = 0; +// int newCount = 0; +// String operatetype = ""; +// CaseInsensitiveMap map = null; +// if (list != null && list.size() > 0) { +// for (Map hashmap : list) { +// map = new CaseInsensitiveMap<>(hashmap); +// Object obj = map.get("operatetype"); +// if (obj != null) { +// operatetype = obj.toString(); +// } +// } +// } +// if (mainlist != null && mainlist.size() > 0) { +// for (Map hashMap : mainlist) { +// map = new CaseInsensitiveMap<>(hashMap); +// Object isdetail = map.get("isdetail"); +// if (isdetail != null) { +// if (StringUtils.isBlank(isdetail.toString())||!"0".equals(isdetail.toString())){ +// continue; +// } +// }else{ +// continue; +// } +// Object oldvalue = map.get("oldvalue"); +// if (oldvalue != null) { +// if (StringUtils.isNotBlank(oldvalue.toString())) { +// oldCount++; +// } +// } +// +// Object newvalue = map.get("newvalue"); +// if (newvalue != null) { +// if (StringUtils.isNotBlank(newvalue.toString())) { +// newCount++; +// } +// } +// +// } +// } +// CaseInsensitiveMap jo = null; +// for(int i = 0 ; i < mainlist.size(); i++) { +// Map jomap = mainlist.get(i); +// jo = new CaseInsensitiveMap<>(jomap); +// String fieldName = jo.get("fielddesc"); +// String oldvalue = obj2String(jo.get("oldvalue")); +// String oldrealvalue = obj2String(jo.get("oldrealvalue")); +// String newValue = obj2String(jo.get("newvalue")); +// String newrealvalue = obj2String(jo.get("newrealvalue")); +// // oracle.sql.CLOB类型处理 +// jomap.put("oldvalue", oldvalue); +// jomap.put("oldrealvalue", oldrealvalue); +// jomap.put("newvalue", newValue); +// jomap.put("newrealvalue", newrealvalue); +// +// String fieldNameLabelId = jo.get("fieldnamelabelid"); +// if (StringUtils.isNotBlank(fieldNameLabelId)&&StringUtils.isNumeric(fieldNameLabelId)) { +// fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId),fieldName); +// } else if (StringUtils.isNotBlank(fieldNameLabelId)&&!StringUtils.isNumeric(fieldNameLabelId) && !"-1".equals(fieldNameLabelId)) { +// fieldName = fieldNameLabelId; +// } else if (StringUtils.isNotBlank(fieldName)&&StringUtils.isNumeric(fieldName)) { +// fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldName),fieldName); +// } +// if (StringUtils.isNotBlank(oldrealvalue)&&StringUtils.isNumeric(oldrealvalue)) { +// oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue),oldvalue); +// }else if (StringUtils.isNotBlank(oldrealvalue)&&!StringUtils.isNumeric(oldrealvalue)) { +// oldvalue = oldrealvalue; +// } +// if (StringUtils.isNotBlank(newrealvalue)&&StringUtils.isNumeric(newrealvalue)) { +// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue),newValue); +// }else if (StringUtils.isNotBlank(newrealvalue)&&!StringUtils.isNumeric(newrealvalue)) { +// newValue = newrealvalue; +// } +// +// //oldvalue,newValue 避免xss漏洞 分别进行转义 +// oldvalue = StringConversionForXSS(oldvalue); +// newValue = StringConversionForXSS(newValue); +// +// if (oldCount != 0) { +// valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); +// +// } else if (oldCount == 0 || newCount==0 || operatetype.startsWith(OperateType.add)||operatetype.startsWith(OperateType.delete)) { +// valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); +// +// } else { +// valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); +// } +// //} +// /*if (valuesChange.length() > 3) { +// values = valuesChange.substring(0, valuesChange.length() - 3); +// }*/ +// } +// +// res.put("valueschanges", valuesChanges); +// res.put("detailcontexts", mainlist); +// return res; +// } +// +// private static String obj2String(Object o) { +// if (o == null) { +// return ""; +// } +// if (o instanceof String) { +// return (String) o; +// } +// return JSON.toJSONString(o); +// } +// +// /** +// * 服务中心结果集转换 +// */ +// public static void switchChangeValues(List list) { +// CaseInsensitiveMap map = null; +// for(Map hashMap : list) { +// map = new CaseInsensitiveMap<>(hashMap); +// int count = 0; +// StringBuilder valuesChange = new StringBuilder(); +// List valuesChanges = new ArrayList(); +// Object detailContexts = map.get("detailcontexts"); +// if(detailContexts != null) { +// JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); +// for(int i = 0 ; i < jsonArray.size(); i++) { +// JSONObject jo = jsonArray.getJSONObject(i); +// String isDetail = jo.getString("isDetail"); +// if (StringUtils.isBlank(isDetail)||!"0".equals(isDetail)){ +// continue; +// } +// String oldvalue = jo.getString("oldValue"); +// if (StringUtils.isNotBlank(oldvalue)) { +// count++; +// } +// } +// } +// +// if(detailContexts != null) { +// JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); +// for(int i = 0 ; i < jsonArray.size(); i++) { +// JSONObject jo = jsonArray.getJSONObject(i); +// String isDetail = jo.getString("isDetail"); +// if (StringUtils.isBlank(isDetail)||!"0".equals(isDetail)){ +// continue; +// } +// String fieldName = jo.getString("fieldDesc"); +// String oldvalue = jo.getString("oldValue"); +// String oldrealvalue = jo.getString("oldRealValue"); +// String newValue = jo.getString("newValue"); +// String newrealvalue = jo.getString("newRealValue"); +// String fieldNameLabelId = jo.getString("fieldNameLabelId"); +// if (StringUtils.isNotBlank(fieldNameLabelId)&&StringUtils.isNumeric(fieldNameLabelId)) { +// fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId)); +// } +// if (StringUtils.isNotBlank(oldrealvalue)&&StringUtils.isNumeric(oldrealvalue)) { +// oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue)); +// } +// if (StringUtils.isNotBlank(newrealvalue)&&StringUtils.isNumeric(newrealvalue)) { +// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue)); +// } +// if (count == 0) { +// valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); +// } else { +// valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); +// } +// +// } +// /*String values = ""; +// if (valuesChange.length() > 3) { +// values = valuesChange.substring(0, valuesChange.length() - 3); +// }*/ +// +// map.put("valueschanges", valuesChanges); +// } +// +// } +// } +// +// public static String valueChangeNewFormat(){ +// return "【%s】：%s"; +// } +// public static String valueChangeFormat(){ +// return "【%s】："+SystemEnv.getHtmlLabelName(61695,"由")+ +// "[%s] "+SystemEnv.getHtmlLabelName(61697,"改为")+" [%s]"; +// } +// +// public static void changKey2Lower(List list) { +// +// List newList = new ArrayList<>(); +// for(Map orgMap : list) { +// Map resultMap = new HashMap<>(); +// +// if (orgMap == null || orgMap.isEmpty()) { +// newList.add(resultMap); +// continue; +// } +// +// Set keySet = orgMap.keySet(); +// for (String key : keySet) { +// resultMap.put(key != null ? key.toLowerCase() : "", orgMap.get(key)); +// } +// newList.add(resultMap); +// } +// list.clear(); +// list.addAll(newList); +// } +// +// /** +// * 查看详细表的数据 +// * @param list +// */ +// public static Map switchDetailChangeValue(List list) { +// Map res = new HashMap<>(); +// List> lists = new ArrayList<>(); +// HashMap repeatTableName = new HashMap<>(); +// CaseInsensitiveMap map = null; +// for (Map hashMap : list) { +// map = new CaseInsensitiveMap<>(hashMap); +// List detailmap = new ArrayList<>(); +// HashMap detailoldMap= new HashMap<>(); +// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); +// detailoldMap.put("dataid",map.get("dataid")); +// HashMap detailnewMap= new HashMap<>(); +// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); +// detailnewMap.put("dataid",map.get("dataid")); +// detailmap.add(detailoldMap); +// detailmap.add(detailnewMap); +// WeaTable wea = new WeaTable(); +// wea.getColumns().add(new WeaTableColumn(SystemEnv.getHtmlLabelName(63250,"操作"), "operator", "5%")); +// wea.getColumns().add(new WeaTableColumn("dataid", "dataid", true)); +// Object tablename = map.get("tablename"); +// Object tablenamelabelid = map.get("tablenamelabelid"); +// if (tablenamelabelid != null) { +// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { +// tablename = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); +// } +// } +// Map m = new HashMap<>(); +// if (tablename!=null&&StringUtils.isNotBlank(tablename.toString())) { +// String temptablename = repeatTableName.get(tablename.toString()); +// if (tablename.toString().equals(temptablename)) { +// continue; +// } +// repeatTableName.put(tablename.toString(), tablename.toString()); +// m.put("tablename", tablename.toString()); +// m.put("detailmap", detailmap); +// m.put("column", wea); +// lists.add(m); +// } else { +// tablename = tablename!=null?tablename:""; +// String temptablename = repeatTableName.get(tablename.toString()); +// if (tablename.toString().equals(temptablename)) { +// continue; +// } +// repeatTableName.put(tablename.toString(), tablename.toString()); +// m.put("tablename", ""); +// m.put("detailmap", detailmap); +// m.put("column", wea); +// lists.add(m); +// } +// } +// +// for (Map hashMap : list) { +// map = new CaseInsensitiveMap<>(hashMap); +// Object isDetail = map.get("isdetail"); +// if (isDetail != null) { +// if ("0".equals(isDetail.toString())) { +// continue; +// } +// } else { +// continue; +// } +// String title = ""; +// String dataIndex = ""; +// String oldValue = ""; +// String newValue = ""; +// String tableName = ""; +// String dataId = ""; +// +// Object fieldDesc = map.get("fielddesc"); +// if (fieldDesc != null) { +// if (StringUtils.isNotBlank(fieldDesc.toString())) { +// title = fieldDesc.toString(); +// } +// } +// +// Object fieldnamelabelid = map.get("fieldnamelabelid"); +// if (fieldnamelabelid != null) { +// if (StringUtils.isNotBlank(fieldnamelabelid.toString())&&StringUtils.isNumeric(fieldnamelabelid.toString())) { +// title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); +// } +// } +// +// Object fieldName = map.get("fieldname"); +// if (fieldName != null) { +// if (StringUtils.isNotBlank(fieldName.toString())) { +// dataIndex = fieldName.toString(); +// } +// } +// Object oValue = map.get("oldvalue"); +// if (oValue != null) { +// if (StringUtils.isNotBlank(oValue.toString())) { +// oldValue = oValue.toString(); +// } +// } +// Object nValue = map.get("newvalue"); +// if (nValue != null) { +// if (StringUtils.isNotBlank(nValue.toString())) { +// newValue = nValue.toString(); +// } +// } +// Object oldRealValue = map.get("oldrealvalue"); +// if (oldRealValue != null) { +// if (StringUtils.isNotBlank(oldRealValue.toString())&&StringUtils.isNumeric(oldRealValue.toString())) { +// oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); +// } +// } +// +// Object newrealvalue = map.get("newrealvalue"); +// if (newrealvalue != null) { +// if (StringUtils.isNotBlank(newrealvalue.toString())&&StringUtils.isNumeric(newrealvalue.toString())) { +// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); +// } +// } +// +// Object tablename = map.get("tablename"); +// if (StringUtils.isNotBlank(tablename.toString())) { +// tableName = tablename.toString(); +// } else { +// tableName = ""; +// } +// Object tablenamelabelid = map.get("tablenamelabelid"); +// if (tablenamelabelid != null) { +// if (tablenamelabelid != null) { +// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { +// tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); +// } +// } +// } +// Object dataid = map.get("dataid"); +// if (StringUtils.isNotBlank(dataid.toString())) { +// dataId = dataid.toString(); +// } else { +// dataId = ""; +// } +// for (Map m : lists) { +// Object o = m.get("tablename"); +// if (o != null) { +// if (tableName.equals(o)) { +// List details = (List) m.get("detailmap"); +// List newDetails = new ArrayList<>(); +// if (details != null && details.size() > 0) { +// for (Map detail : details) { +// Object data_id = detail.get("dataid"); +// if (data_id != null) { +// if (dataId.equals(data_id)) { +// Object operator = detail.get("operator"); +// if (operator != null) { +// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { +// detail.put(dataIndex, oldValue); +// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { +// detail.put(dataIndex, newValue); +// } +// } +// }else{ +// if (newDetails.size() > 2) { +// for (Map newDetail : newDetails) { +// if (dataId.equals(newDetail.get("dataid"))) { +// Object operator = detail.get("operator"); +// if (operator != null) { +// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { +// detail.put(dataIndex, oldValue); +// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { +// detail.put(dataIndex, newValue); +// } +// } +// }else{ +// HashMap detailoldMap= new HashMap<>(); +// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); +// detailoldMap.put("dataid",map.get("dataid")); +// detailoldMap.put(dataIndex, oldValue); +// HashMap detailnewMap= new HashMap<>(); +// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); +// detailnewMap.put("dataid",map.get("dataid")); +// detailnewMap.put(dataIndex, newValue); +// newDetails.add(detailoldMap); +// newDetails.add(detailnewMap); +// } +// } +// }else if (newDetails.size() == 0) { +// int count = 0; +// for (Map mapdetail : details) { +// Object dataid_ = mapdetail.get("dataid"); +// if (dataid_ != null && dataid_.equals(dataId)) { +// count++; +// } +// } +// if (count == 0) { +// HashMap detailoldMap= new HashMap<>(); +// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); +// detailoldMap.put("dataid",map.get("dataid")); +// detailoldMap.put(dataIndex, oldValue); +// HashMap detailnewMap= new HashMap<>(); +// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); +// detailnewMap.put("dataid",map.get("dataid")); +// detailnewMap.put(dataIndex, newValue); +// newDetails.add(detailoldMap); +// newDetails.add(detailnewMap); +// } +// } +// } +// } +// } +// } +// if (newDetails.size() > 0) { +// details.addAll(newDetails); +// newDetails.clear(); +// } +// +// WeaTable column = (WeaTable) m.get("column"); +// if (column != null) { +// List columns = column.getColumns(); +// if (columns != null && columns.size() > 0) { +// Boolean flag = true; +// for (Object object : columns) { +// WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); +// if (weaTableColumn != null) { +// String title1 = weaTableColumn.getTitle(); +// if (title.equals(title1)) { +// flag = false; +// break; +// } +// } +// } +// if (flag) { +// column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); +// m.put("column", column); +// } +// } +// } +// } +// } +// } +// } +// res.put("detail", lists); +// return res; +// } +// +// +// public static void switchDetailChangeValues(List list) { +// for (Map map : list) { +// Map repeatTableName = new HashMap<>(); +// List detailContexts = (List) map.get("detailcontexts"); +// List lists = new ArrayList<>(); +// if (detailContexts != null) { +// for (Map detailContext : detailContexts) { +// List detailmap = new ArrayList<>(); +// HashMap detailoldMap = new HashMap<>(); +// detailoldMap.put("operator", SystemEnv.getHtmlLabelName(63248,"操作(旧)")); +// detailoldMap.put("dataid",detailContext.get("dataid")); +// HashMap detailnewMap = new HashMap<>(); +// detailnewMap.put("operator", SystemEnv.getHtmlLabelName(63249,"操作(新)")); +// detailnewMap.put("dataid",detailContext.get("dataid")); +// detailmap.add(detailoldMap); +// detailmap.add(detailnewMap); +// WeaTable wea = new WeaTable(); +// wea.getColumns().add(new WeaTableColumn(SystemEnv.getHtmlLabelName(63250,"操作"), "operator", "5%")); +// wea.getColumns().add(new WeaTableColumn("dataid", "dataid", true)); +// Object tableName = detailContext.get("tableName"); +// Object tablenamelabelid = detailContext.get("tableNameLabelId"); +// if (tablenamelabelid != null) { +// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { +// tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); +// } +// } +// Map m = new HashMap<>(); +// if (StringUtils.isNotBlank(tableName.toString())) { +// String temptablename = repeatTableName.get(tableName.toString()); +// if (tableName.toString().equals(temptablename)) { +// continue; +// } +// repeatTableName.put(tableName.toString(), tableName.toString()); +// m.put("tablename", tableName.toString()); +// m.put("detailmap", detailmap); +// m.put("column", wea); +// lists.add(m); +// map.put("detail", lists); +// } else { +// String temptablename = repeatTableName.get(tableName.toString()); +// if (tableName.toString().equals(temptablename)) { +// continue; +// } +// repeatTableName.put(tableName.toString(), tableName.toString()); +// m.put("tablename", ""); +// m.put("detailmap", detailmap); +// m.put("column", wea); +// lists.add(m); +// map.put("detail", lists); +// } +// } +// } +// List details = (List) map.get("detail"); +// if (details != null) { +// int size = details.size(); +// int start = 0; +// while (start < size) { +// start++; +// +// for (int i = 0; i < size; i++) { +// Map detail = details.get(i); +// +// //for (Map detail : details) { +// if (details.size() > size) { +// break; +// } +// for (Map detailContext : detailContexts) { +// Object isDetail = detailContext.get("isDetail"); +// if (isDetail != null) { +// if ("0".equals(isDetail.toString())) { +// continue; +// } +// } else { +// continue; +// } +// String title = ""; +// String dataIndex = ""; +// String oldValue = ""; +// String newValue = ""; +// String tableName = ""; +// String dataId = ""; +// Object fieldDesc = detailContext.get("fieldDesc"); +// if (StringUtils.isNotBlank(fieldDesc.toString())) { +// title = fieldDesc.toString(); +// } +// Object fieldnamelabelid = detailContext.get("fieldNameLabelId"); +// if (fieldnamelabelid != null) { +// if (StringUtils.isNotBlank(fieldnamelabelid.toString())&&StringUtils.isNumeric(fieldnamelabelid.toString())) { +// title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); +// } +// } +// Object fieldName = detailContext.get("fieldName"); +// if (StringUtils.isNotBlank(fieldName.toString())) { +// dataIndex = fieldName.toString(); +// } +// Object oValue = detailContext.get("oldValue"); +// if (StringUtils.isNotBlank(oValue.toString())) { +// oldValue = oValue.toString(); +// } +// Object nValue = detailContext.get("newValue"); +// if (StringUtils.isNotBlank(nValue.toString())) { +// newValue = nValue.toString(); +// } +// Object oldRealValue = detailContext.get("oldRealValue"); +// if (oldRealValue != null) { +// if (StringUtils.isNotBlank(oldRealValue.toString())&&StringUtils.isNumeric(oldRealValue.toString())) { +// oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); +// } +// } +// +// Object newrealvalue = detailContext.get("newRealValue"); +// if (newrealvalue != null) { +// if (StringUtils.isNotBlank(newrealvalue.toString())&&StringUtils.isNumeric(newrealvalue.toString())) { +// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); +// } +// } +// Object tablename = detailContext.get("tableName"); +// if (StringUtils.isNotBlank(tablename.toString())) { +// tableName = tablename.toString(); +// } else { +// tableName = ""; +// } +// Object tablenamelabelid = detailContext.get("tableNameLabelId"); +// if (tablenamelabelid != null) { +// if (tablenamelabelid != null) { +// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { +// tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); +// } +// } +// } +// Object dataid = detailContext.get("dataid"); +// if (StringUtils.isNotBlank(dataid.toString())) { +// dataId = dataid.toString(); +// } else { +// dataId = ""; +// } +// Object detailtablename = detail.get("tablename"); +// if (detailtablename != null) { +// if (tableName.equals(detailtablename.toString())) { +// List detailmap = (List) detail.get("detailmap"); +// List newDetails = new ArrayList<>(); +// if (detailmap != null && detailmap.size() > 0) { +// for (Map d : detailmap) { +// Object data_id = d.get("dataid"); +// if (data_id != null) { +// if (dataId.equals(data_id)) { +// Object operator = d.get("operator"); +// if (operator != null) { +// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { +// d.put(dataIndex, oldValue); +// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { +// d.put(dataIndex, newValue); +// } +// } +// }else{ +// if (newDetails.size() > 2) { +// for (Map newDetail : newDetails) { +// if (dataId.equals(newDetail.get("dataid"))) { +// Object operator = d.get("operator"); +// if (operator != null) { +// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { +// d.put(dataIndex, oldValue); +// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { +// d.put(dataIndex, newValue); +// } +// } +// }else{ +// HashMap detailoldMap= new HashMap<>(); +// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); +// detailoldMap.put("dataid",detailContext.get("dataid")); +// detailoldMap.put(dataIndex, oldValue); +// HashMap detailnewMap= new HashMap<>(); +// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); +// detailnewMap.put("dataid",detailContext.get("dataid")); +// detailnewMap.put(dataIndex, newValue); +// newDetails.add(detailoldMap); +// newDetails.add(detailnewMap); +// } +// } +// }else if (newDetails.size() == 0) { +// int count = 0; +// for (Map mapdetail : detailmap) { +// Object dataid_ = mapdetail.get("dataid"); +// if (dataid_ != null && dataid_.equals(dataId)) { +// count++; +// } +// } +// if (count == 0) { +// HashMap detailoldMap= new HashMap<>(); +// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); +// detailoldMap.put("dataid",detailContext.get("dataid")); +// detailoldMap.put(dataIndex, oldValue); +// HashMap detailnewMap= new HashMap<>(); +// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); +// detailnewMap.put("dataid",detailContext.get("dataid")); +// detailnewMap.put(dataIndex, newValue); +// newDetails.add(detailoldMap); +// newDetails.add(detailnewMap); +// } +// } +// } +// } +// } +// } +// if (newDetails.size() > 0) { +// details.addAll(newDetails); +// newDetails.clear(); +// //detailmap = new ArrayList<>(); +// //detail.put("detailmap", detailmap); +// } +// +// WeaTable column = (WeaTable) detail.get("column"); +// if (column != null) { +// List columns = column.getColumns(); +// if (columns != null && columns.size() > 0) { +// Boolean flag = true; +// for (Object object : columns) { +// WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); +// if (weaTableColumn != null) { +// String title1 = weaTableColumn.getTitle(); +// if (title.equals(title1)) { +// flag = false; +// break; +// }else{ +// flag = true; +// } +// } +// } +// if (flag) { +// column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); +// detail.put("column", column); +// } +// } +// } +// } +// } +// } +// } +// } +// } +// } +// } +// +// public static List getSwitchDatabaseData(List list) { +// if (ElogConsts.ORACLE.equalsIgnoreCase(DatabaseUtil.getDatabaseId()) || ElogConsts.SQLSERVER.equalsIgnoreCase(DatabaseUtil.getDatabaseId())) { +// List arrayList = new ArrayList<>(); +// for (Map map : list) { +// Set en = map.entrySet(); +// Map hashMap = new HashMap<>(); +// for (Map.Entry entry : en) { +// Object key = entry.getKey(); +// Object val = null; +// if ("PARAMS".equalsIgnoreCase(key.toString())||"CUSTOMINFO".equalsIgnoreCase(key.toString()) +// || entry.getValue() instanceof ClobProxyImpl || entry.getValue() instanceof Clob) { +// val = JSONObject.toJSON(entry.getValue()); +// }else{ +// val = entry.getValue(); +// } +// hashMap.put(key.toString().toLowerCase(),val ); +// } +// switchDatabaseField(hashMap); +// arrayList.add(hashMap); +// } +// return arrayList; +// }else{ +// for (Map map : list) { +// switchDatabaseField(map); +// } +// return list; +// } +// } +// +// public static List getSwitchDatabaseAnalysisData(List list,Map keys) { +// if (!ElogConsts.MYSQL.equalsIgnoreCase(DatabaseUtil.getDatabaseId())) { +// List arrayList = new ArrayList<>(); +// +// for (Map map : list) { +// Set en = map.entrySet(); +// Map hashMap = new HashMap<>(); +// for (Map.Entry entry : en) { +// Object key = entry.getKey(); +// Object val = entry.getValue(); +// if (key.toString().equalsIgnoreCase(keys.get(key.toString().toLowerCase()))){ +// key = keys.get(key.toString().toLowerCase()); +// }else { +// key = key.toString().toLowerCase(); +// } +// hashMap.put(key.toString(),val ); +// } +// arrayList.add(hashMap); +// } +// return arrayList; +// } +// return list; +// } +// +// /** +// * 获取多个模块名称 +// * @param modules +// * @return +// */ +// public static Map getModuleNames(List modules) { +// Map hashMap = new HashMap<>(); +// if (modules == null || modules.size() == 0) { +// return hashMap; +// } +// for (String module : modules) { +// String modulenum = ElogSeviceUtils.null2String(moduleMap.get(module), module); +// String modulename = ElogSeviceUtils.isLongValue(modulenum) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(modulenum), modulenum) : modulenum; +// hashMap.put(module, modulename); +// } +// return hashMap; +// +// } +// +// private static String StringConversionForXSS(String str) { +// if (StringUtils.isBlank(str)) +// return str; +// //判断是否是json串 是json串的话也直接返回 +// if (isJSONString(str)) +// return str; +// // 判断是否为前端标签类型字符串或带< 或 >的字符串，用false方法 /<(\\w+)[^>]*>(.*?<\\/\\1>)?/ +// Pattern pattern = Pattern.compile("[<>]"); +// Matcher matcher = pattern.matcher(str); +// if (matcher.find()) +// return SecurityUtil.encodeForHtml(str, false); +// //都不是则用true方法 +// return SecurityUtil.encodeForHtml(str, true); +// +// } +// +// +// /** +// * 判断是否为json字符串 +// * +// * @param content +// * @return +// */ +// public static boolean isJSONString(String content) { +// if (StringUtils.isEmpty(content)) { +// return false; +// } +// if (!content.startsWith("{") || !content.endsWith("}")) { +// if (!content.startsWith("[") || !content.endsWith("]")) { +// return false; +// } +// } +// try { +// JSONObject.parse(content); +// return true; +// } catch (Exception e) { +// return false; +// } +// } +// public static List getNameModule(String module) { +// if(StringUtils.isBlank(module)){ +// return new ArrayList<>(); +// } +// Map> dataMap = new HashMap<>(); +// moduleMap.forEach( (k,v)->{ +// List list=new ArrayList<>(); +// Integer moduleCode = moduleMap.get(k); +// String htmlLabelName = SystemEnv.getHtmlLabelName(moduleCode.longValue(), ""); +// if(dataMap.containsKey(htmlLabelName)){ +// list= dataMap.get(htmlLabelName); +// list .add(k); +// }else { +// list.add(k); +// } +// dataMap.put(htmlLabelName,list); +// }); +// return Objects.isNull(dataMap.get(module))?Arrays.asList(module):dataMap.get(module); +// } +//} diff --git a/src/com/engine/salary/elog/util/ElogSeviceUtils.java b/src/com/engine/salary/elog/util/ElogSeviceUtils.java new file mode 100644 index 000000000..3ee65acaa --- /dev/null +++ b/src/com/engine/salary/elog/util/ElogSeviceUtils.java @@ -0,0 +1,547 @@ +package com.engine.salary.elog.util; + +import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.enums.FromTerminalType; +import com.weaver.common.component.table.page.Page; +import com.weaver.common.security.util.SecurityUtil; +import com.weaver.framework.log4j2.constant.ApmConstant; +import com.weaver.framework.rpc.context.impl.TenantRpcContext; +import com.weaver.framework.web.constant.EteamsConstant; +import org.apache.commons.lang3.StringUtils; +import org.apache.dubbo.rpc.RpcContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; + +/** + * @Date: 2022/5/18 23:34 + * @Author: deli.xu + * @Description: elog服务工具类 + **/ +public class ElogSeviceUtils { + + private static final Logger logger = LoggerFactory.getLogger(ElogSeviceUtils.class); + + /*@Autowired + private ComInfoCache comInfoCache; + private static ComInfoCache baseComInfoCache; + + @PostConstruct + public void init() { + baseComInfoCache = comInfoCache; + }*/ + + private static final String TABLE_SPACER = "_"; + private static final String TABLE_SUFFIX = "logs"; + private static final String DETAIL_TABLE_SUFFIX = "_detail"; + public static final String BASE_TABLE = "BASE_ELOG_TABLE"; + + + public static String getTableName(String module, String function) { + return getTableName(module, function, false); + } + + public static String getTableName(String module, String function, boolean isDetail) { + String tablename = module + TABLE_SPACER + function + TABLE_SUFFIX + (isDetail ? DETAIL_TABLE_SUFFIX : ""); +// SecurityUtil.sqlCheck(tablename); + return tablename; + } + + /** + * String 转枚举 + * + * @param c + * @param string + * @param + * @return + */ + public static > T getEnumFromString(Class c, String string) { + if (c != null && string != null) { + try { + return Enum.valueOf(c, string.trim().toUpperCase()); + } catch (IllegalArgumentException ex) { + } + } + return null; + } + + /** + * 获取ip地址 + * + * @param request + * @return + */ + public static String getIp(HttpServletRequest request) { + String ipAddress = request.getHeader("x-forwarded-for"); + String unknown = "unknown"; + if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("Proxy-Client-IP"); + } + if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { + ipAddress = request.getHeader("WL-Proxy-Client-IP"); + } + if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { + ipAddress = request.getRemoteAddr(); + String benji = "127.0.0.1"; + String bj = "0:0:0:0:0:0:0:1"; + if (benji.equals(ipAddress) || bj.equals(ipAddress)) { + ///根据网卡取本机配置的IP + InetAddress inet = null; + try { + inet = InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + logger.error("UnknownHostException", e); + } + if (inet != null) { + ipAddress = inet.getHostAddress(); + } + } + } + ///对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 + int i = 15; + String s = ","; + if (ipAddress != null && ipAddress.length() > i) { + if (ipAddress.indexOf(s) > 0) { + ipAddress = ipAddress.substring(0, ipAddress.indexOf(",")); + } + } + return ipAddress; + } + + /** + * 获取设备信息 + * + * @param request + * @return + */ + public static String getDevice(HttpServletRequest request) { + return request.getHeader("User-Agent"); + } + + /** + * 获取来自终端的信息 + * + * @param context + * @param request + * @return + */ + public static void getFromTerminal(LoggerContext context, HttpServletRequest request) { + String fromTerminal = context.getFromTerminal(); + if (StringUtils.isEmpty(fromTerminal)) { + String device = getDevice(request); + String setFT = ""; + if (StringUtils.isNotEmpty(device)) { + context.setFromTerminal(getFromTerminal(device)); + } + } + } + + + private static String getTraceId(HttpServletRequest request) { + String traceId = request.getHeader("traceId"); + if (StringUtils.isNotBlank(traceId)) { + //System.out.println("traceId:====="+traceId); + return traceId; + } + return ""; + } + + /** + * @param request + * @return localhost:9080/api/fs/demo/updateReport + */ + public static String getRequestUrl(HttpServletRequest request) { + if (Objects.isNull(request) || Objects.isNull(request.getRequestURL())) { + return null; + } + return request.getRequestURL().toString(); + } + + /** + * @param request + * @return /api/fs/demo/updateReport + */ + public static String getRequestUri(HttpServletRequest request) { + return request.getRequestURI(); + } + + /** + * @param request + * @return GET/POST + */ + public static String getRequestMethod(HttpServletRequest request) { + return request.getMethod(); + } + + +// /** +// * 获取当前方法中的日志实体类 +// * @return +// */ +// public static LoggerContext currentElogContext() { +// return ElogThreadLocal.currentLoggerContext(); +// } + + + public static int getIntValue(String v) { + return getIntValue(v, -1); + } + + public static int getIntValue(String v, int def) { + try { + return Integer.parseInt(v); + } catch (Exception var3) { + return def; + } + } + + public static long getLongValue(String v) { + return getLongValue(v, -1l); + } + + public static long getLongValue(String v, long def) { + try { + return Long.parseLong(v); + } catch (Exception var3) { + return def; + } + } + + public static boolean isLongValue(String v) { + try { + Long.parseLong(v); + } catch (Exception e) { + return false; + } + return true; + } + + + + /** + * 获取request请求 + * + * @return + */ + public static HttpServletRequest getRequest() { + return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + } + + /** + * 将对象转换程字符串 + * + * @param obj 目标对象 + * @param def 如果为null时的默认值 + * @return + */ + public static String null2String(Object obj, String def) { + return obj == null ? def : obj.toString(); + } + + public static String null2String(Object obj) { + return null2String(obj, ""); + } + + public static int getIntValue(Object obj, int def) { + try { + return Integer.parseInt(null2String(obj)); + } catch (Exception ex) { + return def; + } + } + + public static Page getPage() { + HttpServletRequest request = getRequest(); + String num = request.getParameter("pageNum"); + String size = request.getParameter("pageSize"); + + Page page = new Page(ElogSeviceUtils.getIntValue(num, 1), ElogSeviceUtils.getIntValue(size, 10)); + return page; + } + +// public static void main(String[] args) { +// //System.out.println(getTableName("select", "from")); +// //DataTypeEnum columnTypeEnum = getEnumFromString(DataTypeEnum.class, "varchar"); +// } + + public static List switchString(List list) { + if (list != null) { + return list.stream().map(m -> { + Set en = m.entrySet(); + for (Map.Entry entry : en) { + if (entry.getValue() != null) { + entry.setValue(String.valueOf(entry.getValue())); + } + } + return m; + }).collect(Collectors.toList()); + } else { + return list; + } + } + + public static List switchComplexString(List list) { + if (list != null) { + return list.stream().map(m -> { + Iterator iterator = m.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry next = iterator.next(); + if (next.getValue() != null) { + if (next.getValue() instanceof Map && "parmas".equals(next.getKey())) { + next.setValue(String.valueOf(next.getValue())); + } + if (next.getValue() instanceof List) { + } else { + next.setValue(String.valueOf(next.getValue())); + } + } + } + return m; + }).collect(Collectors.toList()); + } else { + return list; + } + } + + public static String getTenantKey() { + + String tenantKey = TenantRpcContext.getTenantKey(); + if (StringUtils.isNotBlank(tenantKey)) { + return tenantKey; + } + + return ""; + } + + public static String getEmployeeId() { + + String employeeId = TenantRpcContext.getEmployeeId(); + if (StringUtils.isNotBlank(employeeId)) { + return employeeId; + } + + return ""; + } + +// public static String getUserName() { +// +// String employeeId = getEmployeeId(); +// if (StringUtils.isNotEmpty(employeeId)) { +// SimpleEmployee simpleEmployee = null; +// try { +// HrmCommonUtil hrmCommonUtil = (HrmCommonUtil) ApplicationContextProvider.getBean("hrmCommonUtil"); +// simpleEmployee = hrmCommonUtil.getSimpleEmployee(ElogSeviceUtils.getLongValue(employeeId)); +// } catch (Exception e) { +// logger.error("Exception", e); +// } +// if (simpleEmployee != null) { +// if (StringUtils.isNotBlank(simpleEmployee.getUsername())) { +// return simpleEmployee.getUsername(); +// } +// } +// } +// +// +// return ""; +// } + + /** + * 获取rpc信息（客户端ip和来源设备） + * + * @param context + */ + public static void initRpcInfo(LoggerContext context) { + String device = ""; + String clientIp = ""; + String traceId = ""; + try { + device = RpcContext.getContext().getAttachment(EteamsConstant.DEVICE); + clientIp = RpcContext.getContext().getAttachment(EteamsConstant.CLIENT_IP); + traceId = RpcContext.getContext().getAttachment(ApmConstant.TRACE_ID); + logger.info("rpc调用获取到 device:{},clientIp:{},traceId:{}", device, clientIp, traceId); + } catch (Exception e) { + logger.error("Exception", e); + } + if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { + context.setDevice(device); + } + if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { + context.setFromTerminal(getFromTerminal(device)); + } + + if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { + context.setClientIp(clientIp); + } + if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { + context.setBelongMainId(traceId); + } + } + + public static String getFromTerminal(String device) { + String setFT = ""; + if (StringUtils.isNotEmpty(device)) { + if (!device.contains("wxwork") && device.contains("MicroMessenger")) {//来自微信 + setFT = FromTerminalType.MICO_MSG.getCode(); + } else if (device.contains("wxwork") && device.contains("MicroMessenger")) {//企业微信 + setFT = FromTerminalType.WECHAT.getCode(); + } else if (device.contains("iPhone") && device.contains("Mac")) {//来自 Iphone + setFT = FromTerminalType.IOS.getCode(); + } else if (device.contains("Mac OS") && !device.contains("iPhone") && device.contains("weapp-pc")) {//来自 mac_client + setFT = FromTerminalType.MAC_CLIENT.getCode();//mac_client + } else if (!device.contains("wxwork") && device.contains("Mobile")) {//移动端 + setFT = FromTerminalType.H5.getCode(); + } else if (device.contains("Android") && !device.contains("wxwork")) {//来自安卓 包含安卓并且不包含微信 + setFT = FromTerminalType.ANDROID.getCode(); + } else {//pc + setFT = FromTerminalType.PC.getCode(); + } + } + return setFT; + } + + /** + * sql连接条件注入sql + * + * @param condition + * @return + */ + public static String checkConditionSql(String condition) { + if ("AND".equalsIgnoreCase(condition) || + "OR".equalsIgnoreCase(condition) + ) { + return condition; + } + return "AND"; + } + + public static String checkTypeSql(String type) { + if ("LIKE".equalsIgnoreCase(type) || + "IN".equalsIgnoreCase(type) || + "!<>".equalsIgnoreCase(type) || + "!=".equalsIgnoreCase(type) || + "BETWEEN".equalsIgnoreCase(type) || + "IS NULL".equalsIgnoreCase(type) || + "IS NULL".equalsIgnoreCase(type) || + "=".equalsIgnoreCase(type) || + "IS NOT NULL".equalsIgnoreCase(type)) { + return type; + } + return "="; + } + + /** + * sql条件防止注入 + * + * @param value + * @return + */ + public static String checkValSql(String value) { + if (StringUtils.isBlank(value)) { + return ""; + } + Pattern p = Pattern.compile("\\s+"); + Matcher m = p.matcher(value); + String val = m.replaceAll(" "); + String[] keywords = {"master ", "truncate ", "declare ", "alert ", "create ", "drop ", " version", + "show ", "table ", "index ", "insert ", "into ", "from ", + "select ", "delete ", "update ", "mid ", "master ", "char ","union "}; + + String replaceStr = val.replaceAll(" ", ""); + if (replaceStr.contains("1=1") || replaceStr.contains(";")) { + return "-1"; + } + int count = 0; + String filterVal = ""; + for (String keyddlword : keywords) { + if (val.toLowerCase().contains(keyddlword)) { + count++; + if (count == 1) { + filterVal = keyddlword; + } + } + } + + if (count > 2) { + return filterVal; + } + value = SecurityUtil.ecodeForSql(value); + + return value; + } + + /** + * 压缩工具类- + * + * @param str + * @return desc:version 0.0.1 基于jdk自带 GZIP 压缩。最后转成base64。 + * 市面上有其他压缩像jdk 的 deflate 可以设置压缩级别，但是都是主动的，需要改业务方法， + * snappy 压缩适用于大数据压缩。大数据量比较快 hadoop首选，但是压缩后比例比较大。 + * xz 下的 压缩比率大，但是解压比较慢-不提倡，空间换时间了 + * common下的压缩其实和jdk差不多，网上说优于jdk，但是相差不大。 + * weaver 压缩基于jdk + */ + public static String compress(String str) { + if (str == null || str.trim().length() == 0) { + return str; + } + try (ByteArrayOutputStream out = new ByteArrayOutputStream(); + GZIPOutputStream gzip = new GZIPOutputStream(out)) { + gzip.write(str.getBytes()); + gzip.close(); + return Base64.getEncoder().encodeToString(out.toByteArray()); + } catch (Exception e) { + logger.error("压缩失败", e.getMessage()); + return str; + } + + } + + + /** + * 解压缩 + * + * @param str + * @return + */ + public static String uncompress(String str) { + byte[] decode = Base64.getDecoder().decode(str); + if (str == null || str.trim().length() == 0) { + return str; + } + try (ByteArrayOutputStream out = new ByteArrayOutputStream(); + ByteArrayInputStream in = new ByteArrayInputStream(decode)) { + GZIPInputStream ungzip = new GZIPInputStream(in); + byte[] buffer = new byte[2048]; + int n; + while ((n = ungzip.read(buffer)) >= 0) { + out.write(buffer, 0, n); + } + return new String(out.toByteArray()); + } catch (Exception e) { + logger.error("解缩失败：{}", e.getMessage()); + return str; + } + } + + public static Boolean checkIsNumber(Object obj) { + if (obj == null) { + return false; + } + + return StringUtils.isNumeric(obj.toString()); + + } +} diff --git a/src/com/engine/salary/elog/web/LoggerTableController.java b/src/com/engine/salary/elog/web/LoggerTableController.java new file mode 100644 index 000000000..279bffdfe --- /dev/null +++ b/src/com/engine/salary/elog/web/LoggerTableController.java @@ -0,0 +1,178 @@ +package com.engine.salary.elog.web; + +import com.weaver.common.authority.annotation.WeaPermission; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.common.batch.entity.BatchDocumentMessage; +import com.weaver.common.component.table.WeaTable; +import com.weaver.common.elog.service.ApplicationContextProvider; +import com.weaver.common.elog.service.ILoggerTableService; +import com.weaver.common.elog.service.impl.LoggerTableService; +import com.weaver.framework.spring.annotation.AopClass; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; +import java.util.Map; + +public class LoggerTableController { + + @Autowired + @Qualifier("loggerTableService") + private LoggerTableService loggerTableService; + + @ApiOperation("获取日志") + @RequestMapping(path = "getLogs", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult getLogs(@RequestBody(required = false) @ApiParam("数据") String data){ + + WeaTable weaTable = loggerTableService.queryLogs(data); + return WeaResult.success(weaTable); + } + + @ApiOperation("获取日志（卡片）") + @RequestMapping(path = "getCardLogs", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult>> carddatas(@RequestBody(required = false) @ApiParam("数据") String data){ + List> list = loggerTableService.queryCardLogList(data); + return WeaResult.success(list); + } + + @ApiOperation("获取单条操作记录的更新明细") + @RequestMapping(path = "getDetailChanges", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult>> getDetailChanges(@PathVariable("module") @ApiParam("服务（模块）名")String module, + @PathVariable("function") @ApiParam("方法名")String function, + @RequestParam("mainid") @ApiParam("主键id") String mainid, + @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod) { + return WeaResult.success(loggerTableService.getDetailChanges(module, function,mainid,detailTransMethod)); + } + + /** + * 获取单条操作记录的更新明细(分页) + * @param module 服务（模块）名 + * @param function 方法名 + * @param mainid 主键id + * @param detailTransMethod 转换方法 + * @param current 页码 + * @param pageSize 每页条数 + * @return WeaTable + */ + @ApiOperation("获取单条操作记录的更新明细(分页)") + @RequestMapping(path = "getDetailChangePages", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult getDetailChangePages(@PathVariable("module") @ApiParam("服务（模块）名")String module, + @PathVariable("function") @ApiParam("方法名")String function, + @RequestParam("mainid") @ApiParam("主键id") String mainid, + @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod, + @RequestParam("page") @ApiParam("页码") String current, + @RequestParam("pageSize") @ApiParam("每页条数") String pageSize) { + return WeaResult.success(loggerTableService.getDetailChangePages(module, function,mainid,detailTransMethod,current,pageSize)); + } + + + @ApiOperation("获取日志列表") + @RequestMapping(path = "datas", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult>> datas(@PathVariable("module") @ApiParam("服务（模块）名")String module, + @PathVariable("function") @ApiParam("方法名")String function, + @Param("pageSize") @ApiParam("每页多少数据")String pageSize, + @Param("current") @ApiParam("当前页")String current, + @ApiParam("查询条件") String condition){ + + if("datasecurity".equals(module) && "auditLog".equals(function)) { + try { + ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); + if(tableService != null){ + List> list = tableService.queryLogList(module, function, current, pageSize, condition); + return WeaResult.success(list); + } + } catch ( Exception e) { + + } + } + List> list = loggerTableService.queryLogList(module, function, current, pageSize, condition); + return WeaResult.success(list); + } + + @ApiOperation("获取日志总数") + @RequestMapping(path = "counts", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult> counts(@PathVariable("module") @ApiParam("服务（模块）名") String module, + @PathVariable("function") @ApiParam("方法名")String function){ + return WeaResult.success(loggerTableService.countLog(module,function), "success"); + } + + @ApiOperation("获取明细日志列表") + @RequestMapping(path = "detaildatas", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult>> detaildatas(@PathVariable("module") @ApiParam("服务（模块）名")String module, + @PathVariable("function") @ApiParam("方法名")String function, + @Param("pageSize") @ApiParam("每页多少数据")String pageSize, + @Param("current") @ApiParam("当前页")String current, + @Param("mainId") @ApiParam("主表id") String mainId, + @ApiParam("查询条件") String condition){ + + if("datasecurity".equals(module) && "auditLog".equals(function)) { + try { + ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); + if(tableService != null){ + List> list = tableService.queryDetailLogList(module, function, current, pageSize, condition, mainId); + return WeaResult.success(list); + } + } catch ( Exception e) { + + } + } + List> list = loggerTableService.queryDetailLogList(module, function, current, pageSize, condition, mainId); + return WeaResult.success(list); + } + + @ApiOperation("获取日志总数") + @RequestMapping(path = "detailcounts", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult> detailcounts(@PathVariable("module") @ApiParam("服务（模块）名") String module, + @PathVariable("function") @ApiParam("方法名")String function, + @Param("mainId") @ApiParam("主表id") String mainId){ + return WeaResult.success(loggerTableService.countDestailLog(module,function, mainId), "success"); + } + + @ApiOperation("根据traceId获取链路列表") + @RequestMapping(path = "queryLogTraceInfo", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult queryLogTraceInfo(@PathVariable("module") @ApiParam("服务（模块）名") String module, + @PathVariable("function") @ApiParam("方法名")String function, + @Param("traceId") @ApiParam("traceId") String traceId, + @Param("currentPage") @ApiParam("currentPage") Integer currentPage, + @Param("pageSize") @ApiParam("pageSize") Integer pageSize, + @Param("traceTransMethod") @ApiParam("traceTransMethod") String traceTransMethod + ){ + + if("datasecurity".equals(module) && "auditLog".equals(function)) { + try { + ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); + if(tableService != null){ + return WeaResult.success(tableService.queryElogTraceInfo(traceId,module,function,currentPage,pageSize,traceTransMethod ), "success"); + } + } catch ( Exception e) { + + } + } + + return WeaResult.success(loggerTableService.queryElogTraceInfo(traceId,module,function,currentPage,pageSize,traceTransMethod ), "success"); + } + + @ApiOperation("日志下载") + @RequestMapping(path = "downloadLog", method = {RequestMethod.GET, RequestMethod.POST}) + @WeaPermission(publicPermission = true) + public WeaResult downloadLog(@RequestBody(required = false) @ApiParam("数据") String data){ + + BatchDocumentMessage message = loggerTableService.downloadLog(data); + return WeaResult.success(message); + } +} From b7435554e87fe5fae4aa133ad6e6a04b4d6fc396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 26 Dec 2023 16:12:44 +0800 Subject: [PATCH 027/169] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/salary/web/LoggerTableController.java | 2 +- .../salary/elog/annotation/ElogField.java | 2 +- .../salary/elog/annotation/OperateType.java | 15 + .../annotation/handle/ElogTableScanner.java | 4 +- .../elog/async/LoggerMessageListener.java | 2 +- .../salary/elog/config/ELogTableChecker.java | 2 +- .../elog/{ => entity}/dto/CancelContext.java | 2 +- .../elog/{ => entity}/dto/DataTypeEnum.java | 2 +- .../elog/{ => entity}/dto/ElogBean.java | 2 +- .../{ => entity}/dto/FilterConditionDto.java | 2 +- .../engine/salary/elog/entity/dto/Like.java | 31 + .../elog/{ => entity}/dto/LoggerContext.java | 2 +- .../{ => entity}/dto/LoggerDetailContext.java | 2 +- .../elog/entity/dto/ReadInfoEntity.java | 40 + .../elog/{ => entity}/dto/RedoContext.java | 2 +- .../elog/{ => entity}/dto/ShowColumsDto.java | 2 +- .../{ => entity}/dto/TableChangeBean.java | 2 +- .../{ => entity}/dto/TableColumnBean.java | 2 +- .../elog/entity/param/ELogGetLogParam.java | 35 + .../elog/service/ILocalElogService.java | 4 +- .../elog/service/ILoggerTableService.java | 11 +- .../elog/service/impl/LocalElogService.java | 4 +- .../elog/service/impl/LoggerTableService.java | 1419 +++------ .../elog/threadlocal/ElogThreadLocal.java | 2 +- .../salary/elog/util/ElogServiceUtils.java | 6 +- .../elog/util/ElogSeviceSwitchUtils.java | 2746 +++++++++-------- .../salary/elog/util/ElogSeviceUtils.java | 121 +- .../engine/salary/elog/util/ElogUtils.java | 2 +- .../engine/salary/elog/util/FieldNameMap.java | 94 + .../salary/elog/util/LoggerTemplate.java | 6 +- .../elog/web/LoggerTableController.java | 331 +- .../mapper/elog/ElogTableCheckerMapper.java | 2 +- .../mapper/elog/ElogTableCheckerMapper.xml | 8 +- .../mapper/elog/LocalElogAopDaoMapper.java | 4 +- .../mapper/elog/LocalElogDaoMapper.java | 215 +- .../salary/mapper/elog/LocalElogDaoMapper.xml | 429 ++- .../impl/SalaryAcctEmployeeServiceImpl.java | 32 +- .../service/impl/SalaryItemServiceImpl.java | 2 +- 38 files changed, 2922 insertions(+), 2669 deletions(-) create mode 100644 src/com/engine/salary/elog/annotation/OperateType.java rename src/com/engine/salary/elog/{ => entity}/dto/CancelContext.java (92%) rename src/com/engine/salary/elog/{ => entity}/dto/DataTypeEnum.java (78%) rename src/com/engine/salary/elog/{ => entity}/dto/ElogBean.java (98%) rename src/com/engine/salary/elog/{ => entity}/dto/FilterConditionDto.java (97%) create mode 100644 src/com/engine/salary/elog/entity/dto/Like.java rename src/com/engine/salary/elog/{ => entity}/dto/LoggerContext.java (99%) rename src/com/engine/salary/elog/{ => entity}/dto/LoggerDetailContext.java (99%) create mode 100644 src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java rename src/com/engine/salary/elog/{ => entity}/dto/RedoContext.java (91%) rename src/com/engine/salary/elog/{ => entity}/dto/ShowColumsDto.java (97%) rename src/com/engine/salary/elog/{ => entity}/dto/TableChangeBean.java (98%) rename src/com/engine/salary/elog/{ => entity}/dto/TableColumnBean.java (98%) create mode 100644 src/com/engine/salary/elog/entity/param/ELogGetLogParam.java create mode 100644 src/com/engine/salary/elog/util/FieldNameMap.java diff --git a/src/com/api/salary/web/LoggerTableController.java b/src/com/api/salary/web/LoggerTableController.java index eb33772ce..ddf2b4f41 100644 --- a/src/com/api/salary/web/LoggerTableController.java +++ b/src/com/api/salary/web/LoggerTableController.java @@ -11,5 +11,5 @@ import javax.ws.rs.Path; * @version 1.0 **/ @Path("/bs/hrmsalary/elog") -public class LoggerTableController { +public class LoggerTableController extends com.engine.salary.elog.web.LoggerTableController{ } diff --git a/src/com/engine/salary/elog/annotation/ElogField.java b/src/com/engine/salary/elog/annotation/ElogField.java index 557a14f3c..a60c1f6a7 100644 --- a/src/com/engine/salary/elog/annotation/ElogField.java +++ b/src/com/engine/salary/elog/annotation/ElogField.java @@ -1,6 +1,6 @@ package com.engine.salary.elog.annotation; -import com.engine.salary.elog.dto.DataTypeEnum; +import com.engine.salary.elog.entity.dto.DataTypeEnum; import java.lang.annotation.*; diff --git a/src/com/engine/salary/elog/annotation/OperateType.java b/src/com/engine/salary/elog/annotation/OperateType.java new file mode 100644 index 000000000..7dbb84303 --- /dev/null +++ b/src/com/engine/salary/elog/annotation/OperateType.java @@ -0,0 +1,15 @@ +package com.engine.salary.elog.annotation; + +public class OperateType { + public static final String view = "view"; + public static final String viewSpan = "查看"; + + public static final String add = "add"; + public static final String addSpan = "新增"; + + public static final String update = "update"; + public static final String updateSpan = "更新"; + + public static final String delete = "delete"; + public static final String deleteSpan = "删除"; +} diff --git a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java index 4e75cf8bb..a024d3478 100644 --- a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java +++ b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java @@ -2,8 +2,8 @@ package com.engine.salary.elog.annotation.handle; import com.engine.salary.elog.annotation.ElogField; import com.engine.salary.elog.annotation.ElogTable; -import com.engine.salary.elog.dto.DataTypeEnum; -import com.engine.salary.elog.dto.TableColumnBean; +import com.engine.salary.elog.entity.dto.DataTypeEnum; +import com.engine.salary.elog.entity.dto.TableColumnBean; import com.engine.salary.elog.util.ElogUtils; import lombok.extern.slf4j.Slf4j; import org.reflections.Reflections; diff --git a/src/com/engine/salary/elog/async/LoggerMessageListener.java b/src/com/engine/salary/elog/async/LoggerMessageListener.java index 6687a0603..2bf5dc957 100644 --- a/src/com/engine/salary/elog/async/LoggerMessageListener.java +++ b/src/com/engine/salary/elog/async/LoggerMessageListener.java @@ -1,7 +1,7 @@ package com.engine.salary.elog.async; import com.engine.salary.elog.config.ELogTableChecker; -import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.elog.service.impl.LocalElogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/com/engine/salary/elog/config/ELogTableChecker.java b/src/com/engine/salary/elog/config/ELogTableChecker.java index acbb1dc89..272da15a7 100644 --- a/src/com/engine/salary/elog/config/ELogTableChecker.java +++ b/src/com/engine/salary/elog/config/ELogTableChecker.java @@ -1,6 +1,6 @@ package com.engine.salary.elog.config; -import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.mapper.elog.ElogTableCheckerMapper; import com.engine.salary.util.db.MapperProxyFactory; import dm.jdbc.util.IdGenerator; diff --git a/src/com/engine/salary/elog/dto/CancelContext.java b/src/com/engine/salary/elog/entity/dto/CancelContext.java similarity index 92% rename from src/com/engine/salary/elog/dto/CancelContext.java rename to src/com/engine/salary/elog/entity/dto/CancelContext.java index 1c9771b69..d7ecccb7b 100644 --- a/src/com/engine/salary/elog/dto/CancelContext.java +++ b/src/com/engine/salary/elog/entity/dto/CancelContext.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/com/engine/salary/elog/dto/DataTypeEnum.java b/src/com/engine/salary/elog/entity/dto/DataTypeEnum.java similarity index 78% rename from src/com/engine/salary/elog/dto/DataTypeEnum.java rename to src/com/engine/salary/elog/entity/dto/DataTypeEnum.java index 4b46cdd33..b31b8e490 100644 --- a/src/com/engine/salary/elog/dto/DataTypeEnum.java +++ b/src/com/engine/salary/elog/entity/dto/DataTypeEnum.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; public enum DataTypeEnum { VARCHAR, diff --git a/src/com/engine/salary/elog/dto/ElogBean.java b/src/com/engine/salary/elog/entity/dto/ElogBean.java similarity index 98% rename from src/com/engine/salary/elog/dto/ElogBean.java rename to src/com/engine/salary/elog/entity/dto/ElogBean.java index d4239b9a7..b79b0f66e 100644 --- a/src/com/engine/salary/elog/dto/ElogBean.java +++ b/src/com/engine/salary/elog/entity/dto/ElogBean.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/com/engine/salary/elog/dto/FilterConditionDto.java b/src/com/engine/salary/elog/entity/dto/FilterConditionDto.java similarity index 97% rename from src/com/engine/salary/elog/dto/FilterConditionDto.java rename to src/com/engine/salary/elog/entity/dto/FilterConditionDto.java index d276b1b27..28cb451e5 100644 --- a/src/com/engine/salary/elog/dto/FilterConditionDto.java +++ b/src/com/engine/salary/elog/entity/dto/FilterConditionDto.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import java.io.Serializable; diff --git a/src/com/engine/salary/elog/entity/dto/Like.java b/src/com/engine/salary/elog/entity/dto/Like.java new file mode 100644 index 000000000..2caead76c --- /dev/null +++ b/src/com/engine/salary/elog/entity/dto/Like.java @@ -0,0 +1,31 @@ +package com.engine.salary.elog.entity.dto; + +import java.io.Serializable; + +/** + * @date: 2021/6/1 17:50 + * @author: deli.xu + * @description: + */ +public class Like implements Serializable { + private static final long serialVersionUID = -3399942468474767851L; + private String prefix; + private String suffix; + + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String getSuffix() { + return suffix; + } + + public void setSuffix(String suffix) { + this.suffix = suffix; + } +} diff --git a/src/com/engine/salary/elog/dto/LoggerContext.java b/src/com/engine/salary/elog/entity/dto/LoggerContext.java similarity index 99% rename from src/com/engine/salary/elog/dto/LoggerContext.java rename to src/com/engine/salary/elog/entity/dto/LoggerContext.java index 5b00005f0..f9be10c8f 100644 --- a/src/com/engine/salary/elog/dto/LoggerContext.java +++ b/src/com/engine/salary/elog/entity/dto/LoggerContext.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import com.alibaba.fastjson.annotation.JSONField; import com.engine.salary.elog.annotation.ElogField; diff --git a/src/com/engine/salary/elog/dto/LoggerDetailContext.java b/src/com/engine/salary/elog/entity/dto/LoggerDetailContext.java similarity index 99% rename from src/com/engine/salary/elog/dto/LoggerDetailContext.java rename to src/com/engine/salary/elog/entity/dto/LoggerDetailContext.java index 7bb64e1ff..ef4a66503 100644 --- a/src/com/engine/salary/elog/dto/LoggerDetailContext.java +++ b/src/com/engine/salary/elog/entity/dto/LoggerDetailContext.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import com.engine.salary.elog.annotation.ElogDetailTable; import com.engine.salary.elog.annotation.ElogField; diff --git a/src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java b/src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java new file mode 100644 index 000000000..3f7a364e4 --- /dev/null +++ b/src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java @@ -0,0 +1,40 @@ +package com.engine.salary.elog.entity.dto; + +import java.io.Serializable; +import java.util.Date; + +/** + * @date: 2022/5/14 13:52 + * @author: deli.xu + * @description: + */ + +public class ReadInfoEntity implements Serializable { + private static final long serialVersionUID = -8890667941835568289L; + private Long employeeId; + private Date date; + + public Long getEmployeeId() { + return this.employeeId; + } + + public void setEmployeeId(Long employeeId) { + this.employeeId = employeeId; + } + + public Date getDate() { + return this.date; + } + + public void setDate(Date date) { + this.date = date; + } + + public ReadInfoEntity() { + } + + public ReadInfoEntity(Long employeeId, Date date) { + this.employeeId = employeeId; + this.date = date; + } +} \ No newline at end of file diff --git a/src/com/engine/salary/elog/dto/RedoContext.java b/src/com/engine/salary/elog/entity/dto/RedoContext.java similarity index 91% rename from src/com/engine/salary/elog/dto/RedoContext.java rename to src/com/engine/salary/elog/entity/dto/RedoContext.java index 749643aed..3ec87adb3 100644 --- a/src/com/engine/salary/elog/dto/RedoContext.java +++ b/src/com/engine/salary/elog/entity/dto/RedoContext.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/com/engine/salary/elog/dto/ShowColumsDto.java b/src/com/engine/salary/elog/entity/dto/ShowColumsDto.java similarity index 97% rename from src/com/engine/salary/elog/dto/ShowColumsDto.java rename to src/com/engine/salary/elog/entity/dto/ShowColumsDto.java index 828474be5..b5f47e084 100644 --- a/src/com/engine/salary/elog/dto/ShowColumsDto.java +++ b/src/com/engine/salary/elog/entity/dto/ShowColumsDto.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import java.io.Serializable; diff --git a/src/com/engine/salary/elog/dto/TableChangeBean.java b/src/com/engine/salary/elog/entity/dto/TableChangeBean.java similarity index 98% rename from src/com/engine/salary/elog/dto/TableChangeBean.java rename to src/com/engine/salary/elog/entity/dto/TableChangeBean.java index 463d9dd73..445bd8510 100644 --- a/src/com/engine/salary/elog/dto/TableChangeBean.java +++ b/src/com/engine/salary/elog/entity/dto/TableChangeBean.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/com/engine/salary/elog/dto/TableColumnBean.java b/src/com/engine/salary/elog/entity/dto/TableColumnBean.java similarity index 98% rename from src/com/engine/salary/elog/dto/TableColumnBean.java rename to src/com/engine/salary/elog/entity/dto/TableColumnBean.java index cf8609c61..a6fdf6148 100644 --- a/src/com/engine/salary/elog/dto/TableColumnBean.java +++ b/src/com/engine/salary/elog/entity/dto/TableColumnBean.java @@ -1,4 +1,4 @@ -package com.engine.salary.elog.dto; +package com.engine.salary.elog.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/com/engine/salary/elog/entity/param/ELogGetLogParam.java b/src/com/engine/salary/elog/entity/param/ELogGetLogParam.java new file mode 100644 index 000000000..77132c908 --- /dev/null +++ b/src/com/engine/salary/elog/entity/param/ELogGetLogParam.java @@ -0,0 +1,35 @@ +package com.engine.salary.elog.entity.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ELogGetLogParam { + /** + * 服务（模块）名 + */ + String module; + /** + * 方法名 + */ + String function; + /** + * 查询条件 + */ + String condition; + /** + * 每页多少数据 + */ + String pageSize; + /** + * ' + * 当前页 + */ + String current; + +} diff --git a/src/com/engine/salary/elog/service/ILocalElogService.java b/src/com/engine/salary/elog/service/ILocalElogService.java index 9d721b69c..af12b54c8 100644 --- a/src/com/engine/salary/elog/service/ILocalElogService.java +++ b/src/com/engine/salary/elog/service/ILocalElogService.java @@ -1,7 +1,7 @@ package com.engine.salary.elog.service; -import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.dto.LoggerDetailContext; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerDetailContext; public interface ILocalElogService { diff --git a/src/com/engine/salary/elog/service/ILoggerTableService.java b/src/com/engine/salary/elog/service/ILoggerTableService.java index 00c5b6327..e59fde3fb 100644 --- a/src/com/engine/salary/elog/service/ILoggerTableService.java +++ b/src/com/engine/salary/elog/service/ILoggerTableService.java @@ -1,14 +1,15 @@ package com.engine.salary.elog.service; -import com.weaver.common.batch.entity.BatchDocumentMessage; -import com.weaver.common.component.table.WeaTable; +import com.cloudstore.eccom.pc.table.WeaTable; +import com.engine.salary.elog.entity.param.ELogGetLogParam; +import com.engine.salary.util.page.PageInfo; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; public interface ILoggerTableService { - WeaTable queryLogs(String data); + PageInfo queryLogs(String data); WeaTable queryLogsPapi(String data, HttpServletRequest request); @@ -16,7 +17,7 @@ public interface ILoggerTableService { List getDetailChangesPapi(String module, String function, String mainid, String transMethod, HttpServletRequest request); - List queryLogList(String module, String function, String current, String pageSize, String condition); + List queryLogList(ELogGetLogParam param); List queryCardLogList(String data); @@ -32,7 +33,7 @@ public interface ILoggerTableService { List queryLogInfoByCustom(String module, String function, String field, String value); - BatchDocumentMessage downloadLog(String data); +// BatchDocumentMessage downloadLog(String data); WeaTable getDetailChangePages(String module, String function, String mainid, String detailTransMethod, String current, String pageSize); diff --git a/src/com/engine/salary/elog/service/impl/LocalElogService.java b/src/com/engine/salary/elog/service/impl/LocalElogService.java index d12163a29..3900f4727 100644 --- a/src/com/engine/salary/elog/service/impl/LocalElogService.java +++ b/src/com/engine/salary/elog/service/impl/LocalElogService.java @@ -2,8 +2,8 @@ package com.engine.salary.elog.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.dto.LoggerDetailContext; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerDetailContext; import com.engine.salary.elog.enums.ElogConsts; import com.engine.salary.elog.service.ILocalElogService; import com.engine.salary.elog.util.ElogUtils; diff --git a/src/com/engine/salary/elog/service/impl/LoggerTableService.java b/src/com/engine/salary/elog/service/impl/LoggerTableService.java index bb5dfc812..f81a8c0ab 100644 --- a/src/com/engine/salary/elog/service/impl/LoggerTableService.java +++ b/src/com/engine/salary/elog/service/impl/LoggerTableService.java @@ -4,113 +4,75 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.dto.ElogBean; -import com.engine.salary.elog.dto.FilterConditionDto; -import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.dto.ShowColumsDto; +import com.cloudstore.eccom.pc.table.WeaTable; +import com.cloudstore.eccom.pc.table.WeaTableColumn; +import com.engine.core.impl.Service; +import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.elog.annotation.OperateType; +import com.engine.salary.elog.entity.dto.ElogBean; +import com.engine.salary.elog.entity.dto.FilterConditionDto; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.ShowColumsDto; +import com.engine.salary.elog.entity.param.ELogGetLogParam; +import com.engine.salary.elog.enums.ElogConsts; import com.engine.salary.elog.service.ILoggerTableService; import com.engine.salary.elog.util.ElogServiceUtils; +import com.engine.salary.elog.util.ElogSeviceSwitchUtils; import com.engine.salary.elog.util.ElogSeviceUtils; +import com.engine.salary.elog.util.FieldNameMap; import com.engine.salary.mapper.elog.LocalElogDaoMapper; -import com.weaver.common.batch.consts.FileType; -import com.weaver.common.batch.consts.HandlerFileMethod; -import com.weaver.common.batch.entity.BatchDocumentMessage; -import com.weaver.common.batch.entity.BatchFile; -import com.weaver.common.batch.entity.ExcelSheet; -import com.weaver.common.batch.sender.BatchExportSender; -import com.weaver.common.cache.tablecache.impl.ComInfoCache; -import com.weaver.common.component.table.WeaTable; -import com.weaver.common.component.table.column.WeaTableColumn; -import com.weaver.common.component.table.page.Page; -import com.weaver.common.distribution.genid.IdGenerator; -import com.weaver.common.elog.annotation.HandleElog; -import com.weaver.common.elog.annotation.OperateType; -import com.weaver.common.elog.annotation.handle.ElogMethodHandler; -import com.weaver.common.elog.annotation.handle.MethodHandler; -import com.weaver.common.elog.consts.ElogEsTableConsts; -import com.weaver.common.elog.dao.QueryCommonTabeMapper; -import com.weaver.common.elog.dto.*; -import com.weaver.common.elog.enums.ElogConsts; -import com.weaver.common.elog.service.ApplicationContextProvider; -import com.weaver.common.elog.service.ElogHandleService; -import com.weaver.common.elog.util.*; -import com.weaver.common.hrm.cache.HrmAvatarComInfo; -import com.weaver.common.hrm.cache.HrmEmployeeComInfo; -import com.weaver.common.hrm.domain.organization.HrmConditionResultType; -import com.weaver.common.hrm.domain.organization.HrmOrgEmpCondition; -import com.weaver.common.hrm.entity.employee.HrmEmployee; -import com.weaver.common.hrm.service.HrmCommonEmployeeService; -import com.weaver.common.hrm.util.HrmCommonUtil; -import com.weaver.common.hrm.util.HrmI18nUtil; -import com.weaver.common.i18n.label.SystemEnv; -import com.weaver.common.i18n.tool.config.date.format.DateRangeTransformer; -import com.weaver.common.i18n.tool.util.I18nUtil; -import com.weaver.common.mybatis.baseConfig.WeaDatabaseIdProvider; -import com.weaver.common.mybatis.util.DatabaseUtil; -import com.weaver.common.security.util.SecurityUtil; -import com.weaver.framework.rpc.context.impl.TenantRpcContext; -import com.weaver.teams.security.context.UserContext; -import com.weaver.teams.security.user.User; -import org.apache.commons.collections.CollectionUtils; +import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import com.engine.salary.util.page.Column; +import com.engine.salary.util.page.PageInfo; +import com.engine.salary.util.page.SalaryPageUtil; +import com.github.pagehelper.Page; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.elasticsearch.action.admin.indices.get.GetIndexRequest; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.client.indices.CreateIndexRequest; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.xcontent.XContentType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.annotation.AnnotationUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; -import static com.weaver.common.elog.consts.LogConstants.MAPPING_TEMPLATE; - -public class LoggerTableService implements ILoggerTableService { +public class LoggerTableService extends Service implements ILoggerTableService { private static final Logger logger = LoggerFactory.getLogger(LoggerTableService.class); - @Autowired - private LocalElogDaoMapper localElogDaoMapper; + private LocalElogDaoMapper getLocalElogDaoMapper() { + return MapperProxyFactory.getProxy(LocalElogDaoMapper.class); + } - @Autowired - private ComInfoCache comInfoCache; - - @Autowired - private HrmCommonUtil hrmCommonUtil; - - @Autowired - private QueryCommonTabeMapper queryCommonTabeMapper; - - @Autowired - private RestHighLevelClient restHighLevelClient; - - @Resource - private BatchExportSender batchExportSender; - - - @Resource - private DateRangeTransformer dateRangeTransformer; - - @Autowired - private HrmCommonEmployeeService hrmCommonEmployeeService; - - - private static final String databaseId = DatabaseUtil.getDatabaseId(); + // +// private ComInfoCache comInfoCache; +// +// +// private HrmCommonUtil hrmCommonUtil; +// +// +// private QueryCommonTabeMapper queryCommonTabeMapper; +// +// +// private RestHighLevelClient restHighLevelClient; +// +// @Resource +// private BatchExportSender batchExportSender; +// +// +// @Resource +// private DateRangeTransformer dateRangeTransformer; +// +// +// private HrmCommonEmployeeService hrmCommonEmployeeService; +// +// + private final String databaseId = new RecordSet().getDBType(); @Override - public WeaTable queryLogs(String data) { + public PageInfo queryLogs(String data) { //解析数据 ElogBean elogBean = ElogServiceUtils.getElogBean(data); // columIndex统一转为小写 @@ -143,44 +105,14 @@ public class LoggerTableService implements ILoggerTableService { //获取主表 String tableName = ElogSeviceUtils.getTableName(module, function); //获取weaTable - WeaTable weaTable = new WeaTable(); - List recordColumns = getWeaColumns(data, showColums, module, function, weaTable); + List columns = getWeaColumns(data, showColums, module, function); //获取条件sql - String searchMapsql = getSearchMapSql(searchMap, module, function,elogBean.getShowColumns()); + String searchMapsql = getSearchMapSql(searchMap, module, function, elogBean.getShowColumns()); String sb = getQueryCondition(filterConditionDtos); sb = searchMapsql.concat(sb); - //处理数据权限 - Map res = getCustomAuthSql(transMethod, authParamsJson, "auth"); - if (!res.isEmpty()) { - Object flag = res.get("flag"); - if (flag != null && flag instanceof Boolean) { - boolean f = (boolean) flag; - if (!f) { - weaTable.setCustomParameters(res); - return weaTable; - } - } - } String customSql = getCustomSql(transMethod, sb, "before"); - //处理数据权限（前缀） - Map hashMap = addPermissionHandler(transMethod); - logger.info("查询条件sql:{}", customSql); - //处理数据权限（对接权限sql) - PermissionParams permissionParams = getPermissionParams(hashMap); - String permissionId = permissionParams.getPermissionId(); - String permissionType = permissionParams.getPermissionType(); - String mainDataTable = permissionParams.getMainDataTable(); - String mainDataTableAlias = permissionParams.getMainDataTableAlias(); - String primaryKey = permissionParams.getPrimaryKey(); - String permissionTargetId = permissionParams.getPermissionTargetId(); - String permissionConfigSourceId = permissionParams.getPermissionConfigSourceId(); - - - // 设置操作菜单 - //weaTable.getOperates().add(new WeaTableOperate("查看", 1)); // 分页 - //Page page = ElogSeviceUtils.getPage(); Page page = null; if (StringUtils.isEmpty(downloadSize)) { page = new Page(ElogSeviceUtils.getIntValue(pageNum, 1), ElogSeviceUtils.getIntValue(pageSize, 10)); @@ -189,49 +121,9 @@ public class LoggerTableService implements ILoggerTableService { page = new Page(1, pagesize); } - String columns = getshowColumsStr(showColums); + List list = getLocalElogDaoMapper().queryElogList(page, context, null, tableName, customSql, "*"); + Map countMap = getLocalElogDaoMapper().elogCount(context, tableName, customSql); - Map countMap = new HashMap<>(); - Long countNum = 0l; - - //最终查询前 - List interceptChain = ApplicationContextProvider.getServiceBean(ElogHandleService.class) - .stream().filter(Objects::nonNull) - .filter(x -> x instanceof ElogHandleService) - .map(x -> (ElogHandleService) x) - .collect(Collectors.toList()); - - if (CollectionUtils.isNotEmpty(interceptChain)) { - for (ElogHandleService handleService : interceptChain) { - Class itemClass = handleService.getClass(); - HandleElog annotation = itemClass.getAnnotation(HandleElog.class); - if(Objects.isNull(annotation)){ - annotation = AnnotationUtils.findAnnotation(itemClass, HandleElog.class); - } - if(Objects.nonNull(annotation)){ - if(module.equalsIgnoreCase(annotation.modulename())){ - String employeeId = getUserId(); - long id = StringUtils.isEmpty(employeeId) ? -1 : Long.parseLong(employeeId); - ElogHandleDto elogHandleDto = new ElogHandleDto(module,function,context.getTenant_key(),id,customSql,filterConditionDtos); - boolean preQuery = handleService.preQuery(elogHandleDto); - customSql = elogHandleDto.getSql(); - } - } - } - } - - // 查询 - List list = new ArrayList<>(); - if (StringUtils.isNotEmpty(permissionId) || StringUtils.isNotEmpty(permissionType) || StringUtils.isNotEmpty(mainDataTableAlias) || StringUtils.isNotEmpty(mainDataTable) || StringUtils.isNotEmpty(permissionTargetId) || StringUtils.isNotEmpty(permissionConfigSourceId)) { - list = localElogDaoMapper.queryElogList(page, context, null, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey,permissionTargetId,permissionConfigSourceId,"*"); - countNum = localElogDaoMapper.elogCountOnlyNum(context, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey,permissionTargetId,permissionConfigSourceId); - } else { - list = localElogDaoMapper.queryElogList(page, context, null, tableName, customSql,"*"); - countMap = localElogDaoMapper.elogCount(context, tableName, customSql); - - } - - String databaseId = WeaDatabaseIdProvider.databaseId; if ("st".equals(databaseId)) { //st数据库 date类型特殊处理 list.forEach(map -> { @@ -243,49 +135,6 @@ public class LoggerTableService implements ILoggerTableService { }); } - - String propertiesValue = module + "." + function + ".es"; - String value = ApplicationContextProvider.getPropertiesValue(propertiesValue); - logger.info("propertiesValue:{},value:{}", propertiesValue,value); - if (StringUtils.isNotEmpty(value) && !value.equalsIgnoreCase("${" + propertiesValue + "}")) { - //if判断通过说明走了自定义ES存储es - String[] fields = getESfields(value); - if (fields != null && fields.length > 0) { - for (Map map : list) { - String logDate = map.get("log_date").toString(); - logger.info("logDate:{}" ,logDate); - String esDate = logDate.substring(0, 10); - //先判断表存不存在，不存在创建 - if (checkEsTableIsExist(esDate)) { - // 根据id通过es查询大字段（params）然后赋值 - SearchRequest searchRequest = new SearchRequest(getElogESTableName(true,esDate)); - SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); - // 只获取指定字段 - searchSourceBuilder.fetchSource(fields, null); - // 根据id匹配 - searchSourceBuilder.query(QueryBuilders.termQuery("id",map.get("id").toString())); - searchRequest.source(searchSourceBuilder); - - SearchResponse searchResponse = null; - try { - searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); - } catch (IOException e) { - logger.info("查询ES出现异常:{}",e.getMessage()); - } - SearchHits hits = searchResponse.getHits(); - SearchHit[] searchHits = hits.getHits(); - if (searchHits != null && searchHits.length > 0) { - // 根据id匹配唯一，所以直接取第一个 - Map sourceAsMap = searchHits[0].getSourceAsMap(); - if (Objects.nonNull(sourceAsMap) && sourceAsMap.size() > 0) { - logger.info("ES查出来的sourceAsMap:{}",JSON.toJSONString(sourceAsMap)); - map.putAll(sourceAsMap); - } - } - } - } - } - } //处理转换其他数据库类型值 list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); //处理用户信息Data @@ -293,45 +142,11 @@ public class LoggerTableService implements ILoggerTableService { // 大小写转换 ElogSeviceSwitchUtils.changKey2Lower(list); - transSwitchDataInfo(list,recordColumns); - //转换多语言 - //ElogSeviceSwitchUtils.switchValues(list, recordColumns, true); - //ElogSeviceSwitchUtils.switchChangeValues(list); - logger.info("开始执行转换方法"); - if (Util.isNotEmpty(transMethod)) { - logger.info("转换方法:{}", transMethod); - // 消费到消息,通过MethodHandler调用对应的方法 - MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(transMethod); - if (methodHandler != null) { - try { - logger.info("执行方法前的数据:{}", JSON.toJSONString(list)); - methodHandler.execute(list); - logger.info("执行方法后的数据:{}", JSON.toJSONString(list)); - } catch (Exception e) { - logger.error("转换出错：" + e); - } - } - - } - page.setTotal(ElogSeviceUtils.getLongValue(countMap.get("counts") + "", 0)); - page.setRecords(switchString(list)); - if (!countNum.equals(0l)) { - //countNum不为0 则覆盖 - page.setTotal(countNum); - - } - // 处理后的数据 - // weaTable.setDisplayData(DataTransform.userProcessData(page.getRecords())); - - // 处理操作菜单权限 - //weaTable.setOperatesPermission(DataTransform.userOperatesPermission(page.getRecords())); - - // 处理选择框权限 - //weaTable.setCheckBoxPermission(DataTransform.userCheckBoxPermission(page.getRecords())); - // 存放结果集 - weaTable.setPage(page); - return weaTable; + PageInfo pageInfo = SalaryPageUtil.buildPage(page.getPageNum(), page.getPageSize(), switchString(list)); + pageInfo.setTotal(ElogSeviceUtils.getLongValue(countMap.get("counts") + "", 0)); + pageInfo.setColumns(columns); + return pageInfo; } @Override @@ -350,13 +165,13 @@ public class LoggerTableService implements ILoggerTableService { sb.append("id,uuid,targetid,params,operatetype,link_id,link_type,"); for (ShowColumsDto showColum : showColums) { String columIndex = showColum.getColumIndex(); - if ("date".equalsIgnoreCase(columIndex) || "createdate".equalsIgnoreCase(columIndex)){ + if ("date".equalsIgnoreCase(columIndex) || "createdate".equalsIgnoreCase(columIndex)) { columIndex = "log_date"; - }else if ("operator".equalsIgnoreCase(columIndex)){ + } else if ("operator".equalsIgnoreCase(columIndex)) { columIndex = "log_operator"; - }else if ("modulenamespan".equalsIgnoreCase(columIndex)){ + } else if ("modulenamespan".equalsIgnoreCase(columIndex)) { columIndex = "modulename"; - } else if ("functionnameespan".equalsIgnoreCase(columIndex)){ + } else if ("functionnameespan".equalsIgnoreCase(columIndex)) { columIndex = "functionname"; } else if ("avatar".equals(columIndex)) { continue; @@ -367,63 +182,48 @@ public class LoggerTableService implements ILoggerTableService { return substring; } - private PermissionParams getPermissionParams(Map hashMap) { - PermissionParams permissionParams = new PermissionParams(); - String permissionId = getPermissionStr(hashMap, "permissionId"); - String permissionType = getPermissionStr(hashMap, "permissionType"); - String mainDataTableAlias = getPermissionStr(hashMap, "mainDataTableAlias"); - String mainDataTable = getPermissionStr(hashMap, "mainDataTable"); - String primaryKey = getPermissionStr(hashMap, "primaryKey"); - String permissionTargetId = getPermissionStr(hashMap, "permissionTargetId"); - String permissionConfigSourceId = getPermissionStr(hashMap, "permissionConfigSourceId"); +// private PermissionParams getPermissionParams(Map hashMap) { +// PermissionParams permissionParams = new PermissionParams(); +// String permissionId = getPermissionStr(hashMap, "permissionId"); +// String permissionType = getPermissionStr(hashMap, "permissionType"); +// String mainDataTableAlias = getPermissionStr(hashMap, "mainDataTableAlias"); +// String mainDataTable = getPermissionStr(hashMap, "mainDataTable"); +// String primaryKey = getPermissionStr(hashMap, "primaryKey"); +// String permissionTargetId = getPermissionStr(hashMap, "permissionTargetId"); +// String permissionConfigSourceId = getPermissionStr(hashMap, "permissionConfigSourceId"); +// +// permissionParams.setPermissionId(permissionId); +// permissionParams.setPermissionType(permissionType); +// permissionParams.setMainDataTableAlias(mainDataTableAlias); +// permissionParams.setMainDataTable(mainDataTable); +// permissionParams.setPrimaryKey(primaryKey); +// permissionParams.setPermissionTargetId(permissionTargetId); +// permissionParams.setPermissionConfigSourceId(permissionConfigSourceId); +// +// return permissionParams; +// +// } - permissionParams.setPermissionId(permissionId); - permissionParams.setPermissionType(permissionType); - permissionParams.setMainDataTableAlias(mainDataTableAlias); - permissionParams.setMainDataTable(mainDataTable); - permissionParams.setPrimaryKey(primaryKey); - permissionParams.setPermissionTargetId(permissionTargetId); - permissionParams.setPermissionConfigSourceId(permissionConfigSourceId); - - return permissionParams; - - } - - private List getWeaColumns(String data, List showColums, String module, String function, WeaTable weaTable) { - // 每一个Table的唯一标识 - weaTable.setPageUid(IdGenerator.generate() + ""); - // 表头 - //weaTable.getColumns().add(new WeaTableColumn("id","id", true)); - List recordColumns = new ArrayList<>(); + private List getWeaColumns(String data, List showColums, String module, String function) { + List columns = new ArrayList<>(); if (showColums != null && showColums.size() > 0) { for (ShowColumsDto showColum : showColums) { - if (showColum.isTransfLanguage()) { - recordColumns.add(showColum.getColumIndex()); - } if (StringUtils.isNotBlank(showColum.getAliasColumName())) { - WeaTableColumn weaTableColumn = new WeaTableColumn(showColum.getAliasColumName(), showColum.getColumIndex(), getColumnsWidth(showColum), "", showColum.isHide()); - if (showColum.isNewLine()) { - weaTableColumn.setNewLine(showColum.isNewLine()); - } - weaTable.getColumns().add(weaTableColumn); + columns.add(new Column(showColum.getAliasColumName(), showColum.getColumIndex(), showColum.getColumIndex())); } else if (StringUtils.isNotBlank(showColum.getColumName())) { - WeaTableColumn weaTableColumn = new WeaTableColumn(FieldNameMap.getMainFieldNameMap(data, function, showColum.getColumName()), showColum.getColumIndex(), getColumnsWidth(showColum), "", showColum.isHide()); - if (showColum.isNewLine()) { - weaTableColumn.setNewLine(showColum.isNewLine()); - } - weaTable.getColumns().add(weaTableColumn); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(data, function, showColum.getColumName()), showColum.getColumIndex(), showColum.getColumIndex())); } } } else { - weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "moduleName"), "modulenamespan", "5%")); - weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "functionName"), "functionnamespan", "5%")); - weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "clientIp"), "clientip", "5%")); - weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "operateTypeName"), "operatetypename", "5%")); - weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "targetName"), "targetname", "5%")); - weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "date"), "createdate", "5%")); - weaTable.getColumns().add(new WeaTableColumn(FieldNameMap.getMainFieldNameMap(module, function, "operatorName"), "operatorname", "5%")); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "moduleName"), "modulenamespan", "modulenamespan")); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "functionName"), "functionnamespan", "functionnamespan")); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "clientIp"), "clientip", "clientip")); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "operateTypeName"), "operatetypename", "operatetypename")); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "targetName"), "targetname", "targetname")); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "date"), "createdate", "createdate")); + columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "operatorName"), "operatorname", "operatorname")); } - return recordColumns; + return columns; } private String getTargetid(List filterConditionDtos) { @@ -447,229 +247,116 @@ public class LoggerTableService implements ILoggerTableService { return ""; } - /** - * 处理数据权限 - * - * @param transMethod - * @return - */ - private Map addPermissionHandler(String transMethod) { - Map hashMap = new HashMap(); - hashMap.put("permissionId", ""); - hashMap.put("permissionType", ""); - hashMap.put("mainDataTableAlias", ""); - hashMap.put("mainDataTable", ""); - hashMap.put("primaryKey", ""); - hashMap.put("permissionTargetId", ""); - hashMap.put("permissionConfigSourceId", ""); - - MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler("permission" + transMethod); - if (beforeMethodHandler != null) { - try { - Object execute = beforeMethodHandler.execute(hashMap); - if (execute != null) { - if (execute instanceof Map) { - return (Map) execute; - } - } - } catch (Exception e) { - logger.error("转换出错：" + e); - throw new RuntimeException(e.getMessage()); - } - } - return hashMap; - } - - private Map getCustomAuthSql(String transMethod, Map params, String prefix) { - MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); - Map hashMap = new HashMap<>(); - if (beforeMethodHandler != null) { - try { - hashMap.put("flag", true); - hashMap.put("msg", ""); - hashMap.putAll(params); - Object execute = beforeMethodHandler.execute(hashMap); - if (execute != null && execute instanceof Map) { - Map map = (Map) execute; - return map; - } - } catch (Exception e) { - logger.error("转换出错：" + e); - throw new RuntimeException(e.getMessage()); - } - } - return hashMap; - } +// private Map getCustomAuthSql(String transMethod, Map params, String prefix) { +// MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); +// Map hashMap = new HashMap<>(); +// if (beforeMethodHandler != null) { +// try { +// hashMap.put("flag", true); +// hashMap.put("msg", ""); +// hashMap.putAll(params); +// Object execute = beforeMethodHandler.execute(hashMap); +// if (execute != null && execute instanceof Map) { +// Map map = (Map) execute; +// return map; +// } +// } catch (Exception e) { +// logger.error("转换出错：" + e); +// throw new RuntimeException(e.getMessage()); +// } +// } +// return hashMap; +// } private String getCustomSql(String transMethod, String sql, String prefix) { - MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); - boolean flag = false; - if (beforeMethodHandler != null) { - try { - String subSql = ""; - if (sql.length() > 5) { - flag = true; - subSql = sql.substring(5, sql.length()); - } - Object execute = beforeMethodHandler.execute(subSql); - if (execute != null) { - if (execute instanceof String) { - StringBuffer sb = null; - if(execute.toString().length()==0){ - sb = new StringBuffer(); - } else if (flag || execute.toString().length() > 0) { - sb = new StringBuffer(" and "); - } else { - sb = new StringBuffer(); - } - - sb.append(execute.toString()); - return sb.toString(); - } - } - } catch (Exception e) { - logger.error("转换出错：" + e); - throw new RuntimeException(e.getMessage()); - } - } +// MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); +// boolean flag = false; +// if (beforeMethodHandler != null) { +// try { +// String subSql = ""; +// if (sql.length() > 5) { +// flag = true; +// subSql = sql.substring(5, sql.length()); +// } +// Object execute = beforeMethodHandler.execute(subSql); +// if (execute != null) { +// if (execute instanceof String) { +// StringBuffer sb = null; +// if(execute.toString().length()==0){ +// sb = new StringBuffer(); +// } else if (flag || execute.toString().length() > 0) { +// sb = new StringBuffer(" and "); +// } else { +// sb = new StringBuffer(); +// } +// +// sb.append(execute.toString()); +// return sb.toString(); +// } +// } +// } catch (Exception e) { +// logger.error("转换出错：" + e); +// throw new RuntimeException(e.getMessage()); +// } +// } return sql; } private void transUserInfo(List list) { - List operators = new ArrayList<>(); - if (list != null && list.size() > 0) { - for (Map map : list) { - //避免暴露内网地址 - map.remove("requesturl"); - - Object operator = map.get("operator"); - if (operator != null && StringUtils.isNotBlank(operator.toString())) { - operators.add(ElogSeviceUtils.getLongValue(operator.toString())); - } - } - } - List cacheList = comInfoCache.getCacheList(HrmEmployeeComInfo.class, operators); - Map infoHashMap = new HashMap<>(); - if (cacheList != null && cacheList.size() > 0) { - for (HrmEmployeeComInfo hrmEmployeeComInfo : cacheList) { - HrmAvatarComInfo hrmAvatarComInfo = (HrmAvatarComInfo) comInfoCache.getCacheById(HrmAvatarComInfo.class, hrmEmployeeComInfo.getAvatar()); - ElogHrmSimpleEmployeeInfo info = new ElogHrmSimpleEmployeeInfo(); - if (hrmAvatarComInfo != null) { - info.setAvatarP3Id(hrmAvatarComInfo.getP3()); - } - info.setId(hrmEmployeeComInfo.getId()); - info.setUserName(hrmEmployeeComInfo.getUsername()); - infoHashMap.put(hrmEmployeeComInfo.getId(), info); - } - } - if (list != null && list.size() > 0) { - for (Map map : list) { - Object operator = map.get("operator"); - if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { - map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); - } - map.put("dboperatorname", Util.null2String(map.get("operatorname"))); - if (operator != null && StringUtils.isNotBlank(operator.toString())) { - Map i18nOperatorMap = new HashMap<>(); - ElogHrmSimpleEmployeeInfo hrmEmployeeComInfo = infoHashMap.get(Long.parseLong(operator.toString())); - if (hrmEmployeeComInfo != null) { - //获取最新的人员名称并进行多语言转换 - i18nOperatorMap.put(Long.parseLong(operator.toString()),hrmEmployeeComInfo.getUserName()); - Map parseI18nOperator = HrmI18nUtil.batchCovertEmployee(i18nOperatorMap, map.get("tenant_key").toString()); - map.put("operatorname", parseI18nOperator.get(Long.parseLong(operator.toString()))); - -// if (StringUtils.isNotEmpty(hrmEmployeeComInfo.getUserName())) { -// map.put("operatorname", hrmEmployeeComInfo.getUserName()); -// } - if (hrmEmployeeComInfo.getAvatarP3Id() != null) { - map.put("avatar", hrmEmployeeComInfo.getAvatarP3Id()); - } - } - } - } - } - } - - private void transSwitchDataInfo(List list, List recordColumns) { - List operators = new ArrayList<>(); - if (list != null && list.size() > 0) { - for (Map map : list) { - //避免暴露内网地址 - map.remove("requesturl"); - - map.put("dboperatorname", Util.null2String(map.get("operatorname"))); - ElogSeviceSwitchUtils.switchDatabaseField(map); - Object operator = map.get("operator"); - if (operator != null && StringUtils.isNotBlank(operator.toString())) { - operators.add(ElogSeviceUtils.getLongValue(operator.toString())); - } - if (map.get("PARAMS") != null) { - map.put("params", JSONObject.toJSON(map.get("PARAMS"))); - } else if (map.get("params") != null) { - map.put("params", JSONObject.toJSON(map.get("params"))); - } - for (String recordColumn : recordColumns) { - Object val = map.get(recordColumn); - if (val != null) { - map.put(recordColumn, ElogSeviceSwitchUtils.transfi18Method(val.toString())); - } - } - Object modulename = map.get("modulename"); - if (modulename != null) { - map.put("modulenamespan", ElogSeviceSwitchUtils.getModuleName(modulename.toString())); - } - - } - } - List cacheList = comInfoCache.getCacheList(HrmEmployeeComInfo.class, operators); - Map infoHashMap = new HashMap<>(); - if (cacheList != null && cacheList.size() > 0) { - for (HrmEmployeeComInfo hrmEmployeeComInfo : cacheList) { - ElogHrmSimpleEmployeeInfo info = new ElogHrmSimpleEmployeeInfo(); - info.setId(hrmEmployeeComInfo.getId()); - info.setUserName(hrmEmployeeComInfo.getUsername()); - infoHashMap.put(hrmEmployeeComInfo.getId(), info); - } - } - if (list != null && list.size() > 0) { - for (Map map : list) { - Object operator = map.get("operator"); - if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { - map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); - map.put("params",SecurityUtil.encodeForHtml(map.get("params").toString(), true)); - - } - //获取最新的人员名称并进行多语言转换 - if (operator != null && StringUtils.isNotBlank(operator.toString())) { - Map i18nOperatorMap = new HashMap<>(); - ElogHrmSimpleEmployeeInfo hrmEmployeeComInfo = infoHashMap.get(Long.parseLong(operator.toString())); - if (hrmEmployeeComInfo != null && StringUtils.isNotEmpty(hrmEmployeeComInfo.getUserName())) { - i18nOperatorMap.put(Long.parseLong(operator.toString()),hrmEmployeeComInfo.getUserName()); - Map parseI18nOperator = HrmI18nUtil.batchCovertEmployee(i18nOperatorMap, map.get("tenant_key").toString()); - map.put("operatorname", parseI18nOperator.get(Long.parseLong(operator.toString()))); -// map.put("operatorname", hrmEmployeeComInfo.getUserName()); - } - } - } - } - } - - /** - * 查询头像相关信息 - * - * @param id - * @return - */ -// private String queryAvatarInfo(long id) { -// Map avatarInfoMap = queryAvatarInfoMapper.queryAvatarInfo(id); -// if (avatarInfoMap != null) { -// if (avatarInfoMap.get("p3") != null) { -// return avatarInfoMap.get("p3").toString(); +// List operators = new ArrayList<>(); +// if (list != null && list.size() > 0) { +// for (Map map : list) { +// //避免暴露内网地址 +// map.remove("requesturl"); +// +// Object operator = map.get("operator"); +// if (operator != null && StringUtils.isNotBlank(operator.toString())) { +// operators.add(ElogSeviceUtils.getLongValue(operator.toString())); +// } // } // } -// return ""; -// } +// List cacheList = comInfoCache.getCacheList(HrmEmployeeComInfo.class, operators); +// Map infoHashMap = new HashMap<>(); +// if (cacheList != null && cacheList.size() > 0) { +// for (HrmEmployeeComInfo hrmEmployeeComInfo : cacheList) { +// HrmAvatarComInfo hrmAvatarComInfo = (HrmAvatarComInfo) comInfoCache.getCacheById(HrmAvatarComInfo.class, hrmEmployeeComInfo.getAvatar()); +// ElogHrmSimpleEmployeeInfo info = new ElogHrmSimpleEmployeeInfo(); +// if (hrmAvatarComInfo != null) { +// info.setAvatarP3Id(hrmAvatarComInfo.getP3()); +// } +// info.setId(hrmEmployeeComInfo.getId()); +// info.setUserName(hrmEmployeeComInfo.getUsername()); +// infoHashMap.put(hrmEmployeeComInfo.getId(), info); +// } +// } +// if (list != null && list.size() > 0) { +// for (Map map : list) { +// Object operator = map.get("operator"); +// if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { +// map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); +// } +// map.put("dboperatorname", Util.null2String(map.get("operatorname"))); +// if (operator != null && StringUtils.isNotBlank(operator.toString())) { +// Map i18nOperatorMap = new HashMap<>(); +// ElogHrmSimpleEmployeeInfo hrmEmployeeComInfo = infoHashMap.get(Long.parseLong(operator.toString())); +// if (hrmEmployeeComInfo != null) { +// //获取最新的人员名称并进行多语言转换 +// i18nOperatorMap.put(Long.parseLong(operator.toString()), hrmEmployeeComInfo.getUserName()); +// Map parseI18nOperator = HrmI18nUtil.batchCovertEmployee(i18nOperatorMap, map.get("tenant_key").toString()); +// map.put("operatorname", parseI18nOperator.get(Long.parseLong(operator.toString()))); +// +//// if (StringUtils.isNotEmpty(hrmEmployeeComInfo.getUserName())) { +//// map.put("operatorname", hrmEmployeeComInfo.getUserName()); +//// } +// if (hrmEmployeeComInfo.getAvatarP3Id() != null) { +// map.put("avatar", hrmEmployeeComInfo.getAvatarP3Id()); +// } +// } +// } +// } +// } + } /** * 获取宽度 @@ -686,36 +373,36 @@ public class LoggerTableService implements ILoggerTableService { } private String getTenantKey() { - User currentUser = UserContext.getCurrentUser(); - if (currentUser != null) { - return currentUser.getTenantKey(); - } else { - String tenantKey = TenantRpcContext.getTenantKey(); - if (StringUtils.isNotBlank(tenantKey)) { - return tenantKey; - } - } - return ""; +// User currentUser = UserContext.getCurrentUser(); +// if (currentUser != null) { +// return currentUser.getTenantKey(); +// } else { +// String tenantKey = TenantRpcContext.getTenantKey(); +// if (StringUtils.isNotBlank(tenantKey)) { +// return tenantKey; +// } +// } + return SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; } - private String getEmployeeId() { - - User currentUser = UserContext.getCurrentUser(); - if (currentUser != null&&!currentUser.isAdmin()) { - String employeeId = TenantRpcContext.getEmployeeId(); - return StringUtils.isNotBlank(employeeId) ? employeeId : ""; - } - return ""; - } - - private String getUserId(){ - User currentUser = UserContext.getCurrentUser(); - if (currentUser != null) { - return currentUser.getEmployeeId().toString(); - } - String employeeId = TenantRpcContext.getEmployeeId(); - return StringUtils.isNotBlank(employeeId) ? employeeId : ""; - } +// private String getEmployeeId() { +// +// User currentUser = UserContext.getCurrentUser(); +// if (currentUser != null && !currentUser.isAdmin()) { +// String employeeId = TenantRpcContext.getEmployeeId(); +// return StringUtils.isNotBlank(employeeId) ? employeeId : ""; +// } +// return ""; +// } +// +// private String getUserId() { +// User currentUser = UserContext.getCurrentUser(); +// if (currentUser != null) { +// return currentUser.getEmployeeId().toString(); +// } +// String employeeId = TenantRpcContext.getEmployeeId(); +// return StringUtils.isNotBlank(employeeId) ? employeeId : ""; +// } /** * 拼接搜索条件 @@ -733,31 +420,31 @@ public class LoggerTableService implements ILoggerTableService { while (iterators.hasNext()) { Map.Entry next = iterators.next(); String key = next.getKey(); - SecurityUtil.sqlCheck(key); +// SecurityUtil.sqlCheck(key); if ("date".equals(key) || "createdate".equals(key)) { Object date = next.getValue(); if (date != null) { if (StringUtils.isNotBlank(date.toString())) { List dates = (List) date; - if (dates != null && dates.size() == 2) { - Object startDate = dates.get(0); - Object endDate = dates.get(1); - startDate = ElogSeviceUtils.checkValSql(startDate.toString()); - endDate = ElogSeviceUtils.checkValSql(endDate.toString()); - if (StringUtils.isNotBlank(startDate.toString()) && StringUtils.isNotBlank(endDate.toString())) { - startDate = startDate.toString().replaceAll("'", "''"); - endDate = endDate.toString().replaceAll("'", "''"); - String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); - String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); - sb.append(" and log_date ").append(" between ").append(getSwithDatabaseDate(dateRangeAfter)).append(" and ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); - } else if (StringUtils.isNotBlank(startDate.toString())) { - String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); - sb.append(" and log_date ").append(" >= ").append(getSwithDatabaseDate(dateRangeAfter)).append(" "); - } else if (StringUtils.isNotBlank(endDate.toString())) { - String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); - sb.append(" and log_date ").append(" <= ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); - } - } +// if (dates != null && dates.size() == 2) { +// Object startDate = dates.get(0); +// Object endDate = dates.get(1); +// startDate = ElogSeviceUtils.checkValSql(startDate.toString()); +// endDate = ElogSeviceUtils.checkValSql(endDate.toString()); +// if (StringUtils.isNotBlank(startDate.toString()) && StringUtils.isNotBlank(endDate.toString())) { +// startDate = startDate.toString().replaceAll("'", "''"); +// endDate = endDate.toString().replaceAll("'", "''"); +// String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); +// String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); +// sb.append(" and log_date ").append(" between ").append(getSwithDatabaseDate(dateRangeAfter)).append(" and ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); +// } else if (StringUtils.isNotBlank(startDate.toString())) { +// String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); +// sb.append(" and log_date ").append(" >= ").append(getSwithDatabaseDate(dateRangeAfter)).append(" "); +// } else if (StringUtils.isNotBlank(endDate.toString())) { +// String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); +// sb.append(" and log_date ").append(" <= ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); +// } +// } } } } else if ("operator".equals(next.getKey())) { @@ -766,22 +453,24 @@ public class LoggerTableService implements ILoggerTableService { if (StringUtils.isNotBlank(operator.toString())) { operator = ElogSeviceUtils.checkValSql(operator.toString()); operator = operator.toString().replaceAll("'", "''"); - if (StringUtils.isNumeric(operator.toString()) && operator.toString().length() > 15 ) { + if (StringUtils.isNumeric(operator.toString()) && operator.toString().length() > 15) { sb.append(" and log_operator = ").append(operator.toString()).append(" "); - } else { - List likeNameHrmEmployeeList = hrmCommonEmployeeService.queryEmpsByCondidtion( - new HrmOrgEmpCondition().setNameLikeList(Arrays.asList(operator.toString())).setTenantKey(getTenantKey()), - HrmConditionResultType.BEAN.name()); - if (likeNameHrmEmployeeList != null && likeNameHrmEmployeeList.size() > 0) { - List ids = likeNameHrmEmployeeList.stream().map(HrmEmployee::getId).collect(Collectors.toList()); - if (ids != null && ids.size() > 0) { - sb.append(" and ( operatorname like '%").append(operator.toString()).append("%' ") - .append(" or log_operator in (").append(StringUtils.join(ids, ",")).append(")) "); - } - } else { - sb.append(" and operatorname like '%").append(operator.toString()).append("%' "); - } } + +// else { +// List likeNameHrmEmployeeList = hrmCommonEmployeeService.queryEmpsByCondidtion( +// new HrmOrgEmpCondition().setNameLikeList(Arrays.asList(operator.toString())).setTenantKey(getTenantKey()), +// HrmConditionResultType.BEAN.name()); +// if (likeNameHrmEmployeeList != null && likeNameHrmEmployeeList.size() > 0) { +// List ids = likeNameHrmEmployeeList.stream().map(HrmEmployee::getId).collect(Collectors.toList()); +// if (ids != null && ids.size() > 0) { +// sb.append(" and ( operatorname like '%").append(operator.toString()).append("%' ") +// .append(" or log_operator in (").append(StringUtils.join(ids, ",")).append(")) "); +// } +// } else { +// sb.append(" and operatorname like '%").append(operator.toString()).append("%' "); +// } +// } } } } else if ("modulename".equals(next.getKey())) { @@ -823,7 +512,7 @@ public class LoggerTableService implements ILoggerTableService { } } } - } else if (databaseId.equalsIgnoreCase(ElogConsts.POSTGRESQL) && "targetid".equalsIgnoreCase(next.getKey())){ + } else if (databaseId.equalsIgnoreCase(ElogConsts.POSTGRESQL) && "targetid".equalsIgnoreCase(next.getKey())) { //兼容PG环境int类型不支持模糊搜索的问题 String value = next.getValue().toString().replaceAll("'", "''"); value = ElogSeviceUtils.checkValSql(value.toString()); @@ -838,33 +527,32 @@ public class LoggerTableService implements ILoggerTableService { String value = next.getValue().toString().replaceAll("'", "''"); value = ElogSeviceUtils.checkValSql(value.toString()); StringBuilder stringBuffer = new StringBuilder(); - if (isLikeSearch(showColumns, key)) { - String logSearchSql = I18nUtil.getLogSearchSql(ElogSeviceUtils.getTableName(module, function), key, value); - String sql = logSearchSql.replaceAll("%_", "%\\\\_"); - try { - logger.error("执行多语言sql：{}",sql); - List maps = queryCommonTabeMapper.queryLabelIds(sql); - if (maps != null && maps.size() > 0) { - for (Map map1 : maps) { - Object indexid = map1.get(key); - if (indexid == null || StringUtils.isEmpty(indexid.toString())) { - indexid = map1.get(key.toLowerCase()); - } - if (indexid != null && StringUtils.isNotEmpty(indexid.toString())) { - String val = indexid.toString().replace("'", "''"); - if (ElogSeviceUtils.checkIsNumber(map.get(key))) { - val = "-"+val; - value = "-"+value; - } - stringBuffer.append("'").append(val).append("',"); - } - } - } - } catch (Exception e) { - logger.error("i18查询sql报错：{}",e.getMessage(),e); - } - - } +// if (isLikeSearch(showColumns, key)) { +// String logSearchSql = I18nUtil.getLogSearchSql(ElogSeviceUtils.getTableName(module, function), key, value); +// String sql = logSearchSql.replaceAll("%_", "%\\\\_"); +// try { +// List maps = queryCommonTabeMapper.queryLabelIds(sql); +// if (maps != null && maps.size() > 0) { +// for (Map map1 : maps) { +// Object indexid = map1.get(key); +// if (indexid == null || StringUtils.isEmpty(indexid.toString())) { +// indexid = map1.get(key.toLowerCase()); +// } +// if (indexid != null && StringUtils.isNotEmpty(indexid.toString())) { +// String val = indexid.toString().replace("'", "''"); +// if (ElogSeviceUtils.checkIsNumber(map.get(key))) { +// val = "-" + val; +// value = "-" + value; +// } +// stringBuffer.append("'").append(val).append("',"); +// } +// } +// } +// } catch (Exception e) { +// logger.error("i18查询sql报错：{}", e.getMessage(), e); +// } +// +// } String str = ""; if (stringBuffer.toString().length() > 0) { str = stringBuffer.substring(0, stringBuffer.length() - 1); @@ -900,38 +588,38 @@ public class LoggerTableService implements ILoggerTableService { return sb.toString(); } - /** - * 是否模糊搜索 - * @param showColumns - * @param key - * @return - */ - private boolean isLikeSearch(List showColumns, String key) { - for (ShowColumsDto showColumn : showColumns) { - if (key.equalsIgnoreCase(showColumn.getColumIndex()) && showColumn.isTransfLanguage()) { - return true; - } - } - return false; - } +// /** +// * 是否模糊搜索 +// * +// * @param showColumns +// * @param key +// * @return +// */ +// private boolean isLikeSearch(List showColumns, String key) { +// for (ShowColumsDto showColumn : showColumns) { +// if (key.equalsIgnoreCase(showColumn.getColumIndex()) && showColumn.isTransfLanguage()) { +// return true; +// } +// } +// return false; +// } - private String getSwithDatabaseDate(String date) { - SecurityUtil.ecodeForSql(date); - if (ElogConsts.ORACLE.equals(DatabaseUtil.getDatabaseId())) { - return " to_date('"+date+"','yyyy-mm-dd hh24:mi:ss') "; - } else if (ElogConsts.POSTGRESQL.equals(DatabaseUtil.getDatabaseId())) { - return " to_timestamp('"+date+"', 'YYYY-MM-DD HH24:MI:SS') "; - } else if (ElogConsts.SQLSERVER.equals(DatabaseUtil.getDatabaseId())) { - return " convert(nvarchar(19),'"+date+"',120) "; - } else { - return " DATE_FORMAT('"+date+"','%Y-%m-%d %H:%i:%s') "; - } - } +// private String getSwithDatabaseDate(String date) { +// if (ElogConsts.ORACLE.equals(DatabaseUtil.getDatabaseId())) { +// return " to_date('" + date + "','yyyy-mm-dd hh24:mi:ss') "; +// } else if (ElogConsts.POSTGRESQL.equals(DatabaseUtil.getDatabaseId())) { +// return " to_timestamp('" + date + "', 'YYYY-MM-DD HH24:MI:SS') "; +// } else if (ElogConsts.SQLSERVER.equals(DatabaseUtil.getDatabaseId())) { +// return " convert(nvarchar(19),'" + date + "',120) "; +// } else { +// return " DATE_FORMAT('" + date + "','%Y-%m-%d %H:%i:%s') "; +// } +// } public String matchOperatetype(String str) { - if (ElogSeviceUtils.currentLanguage() != 8) { - return ""; - } +// if (ElogSeviceUtils.currentLanguage() != 8) { +// return ""; +// } List list = new ArrayList(); list.add(OperateType.add); list.add(OperateType.update); @@ -989,11 +677,6 @@ public class LoggerTableService implements ILoggerTableService { */ private String getsql(FilterConditionDto filterConditionDto) { StringBuffer sb = new StringBuffer(); - /* if (StringUtils.isNotBlank(filterConditionDto.getSql())) { - sb.append(" ").append(filterConditionDto.getSql()).append(" "); - return sb.toString(); - }*/ - SecurityUtil.sqlCheck(filterConditionDto.getColumIndex()); filterConditionDto.setConnectCondition(ElogSeviceUtils.checkConditionSql(filterConditionDto.getConnectCondition())); filterConditionDto.setType(ElogSeviceUtils.checkTypeSql(filterConditionDto.getType())); filterConditionDto.setValue(ElogSeviceUtils.checkValSql(filterConditionDto.getValue())); @@ -1176,6 +859,7 @@ public class LoggerTableService implements ILoggerTableService { /** * 明细分页查询 + * * @param module * @param function * @param mainid @@ -1189,45 +873,35 @@ public class LoggerTableService implements ILoggerTableService { Integer pageNum = Util.getIntValue(current, 1); Integer size = Util.getIntValue(pageSize, 10); - Page page = new Page(pageNum,size); + Page page = new Page(pageNum, size); List> list = getDetailChangesMethod(module, function, mainid, null, page); //查询分页总数 String tableName = ElogSeviceUtils.getTableName(module, function, true); - Integer total = localElogDaoMapper.queryAllChangesPageCounts(tableName, mainid); - page.setTotal(total); - WeaTable weaTable =new WeaTable(); + Integer total = getLocalElogDaoMapper().queryAllChangesPageCounts(tableName, mainid); + WeaTable weaTable = new WeaTable(); weaTable.setColumns(getDetailColumns(list)); - weaTable.setPage(page); - weaTable.setData(list); - if (Util.isNotEmpty(detailTransMethod)) { - // 消费到消息,通过MethodHandler调用对应的方法 - MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(detailTransMethod); - if (methodHandler != null) { - try { - methodHandler.execute(weaTable); - } catch (Exception e) { - logger.error("转换出错：" + e); - } - } - } + + PageInfo pageInfo = SalaryPageUtil.buildPage(pageNum, size, list); + pageInfo.setTotal(total); + return weaTable; } private List getDetailColumns(List> list) { List columns = new ArrayList<>(); - if (Util.isNotEmpty(list)) { - List detailcontexts= (List) list.get(0).get("detailcontexts"); - if (Util.isNotEmpty(detailcontexts)) { + if (CollectionUtils.isNotEmpty(list)) { + List detailcontexts = (List) list.get(0).get("detailcontexts"); + if (CollectionUtils.isNotEmpty(detailcontexts)) { for (Map map : detailcontexts) { WeaTableColumn weaTableColumn = new WeaTableColumn(); // 列表属性名 - weaTableColumn.setDataIndex((String) map.get("fieldname")); + weaTableColumn.setColumn((String) map.get("fieldname")); //显示名称 多语言转换 fieldnamelabelid - weaTableColumn.setTitle((String) map.get("fieldname")); + weaTableColumn.setText((String) map.get("fieldname")); columns.add(weaTableColumn); } } @@ -1235,69 +909,24 @@ public class LoggerTableService implements ILoggerTableService { return columns; } - public List> getDetailChangesMethod(String module, String function, String mainid, String detailTransMethod,Page page) { + public List> getDetailChangesMethod(String module, String function, String mainid, String detailTransMethod, Page page) { List list = new ArrayList<>(); String tableName = ElogSeviceUtils.getTableName(module, function, true); String maintableName = ElogSeviceUtils.getTableName(module, function, false); - List maps = localElogDaoMapper.queryAllMainData(maintableName, mainid); - - for (Map map : maps) { - - if (map.get("params") != null && ElogConsts.ES.equalsIgnoreCase(map.get("params").toString())) { - - String logDate = map.get("log_date").toString(); - logger.info("logDate:{}" ,logDate); - String esDate = logDate.substring(0, 10); - //先判断表存不存在，不存在创建 - if (checkEsTableIsExist(esDate)) { - // 根据id通过es查询大字段（params）然后赋值 - SearchRequest searchRequest = new SearchRequest(getElogESTableName(true,esDate)); - - SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); - // 只获取指定字段 - String[] fields = {"params"}; - searchSourceBuilder.fetchSource(fields, null); - // 根据id匹配 - searchSourceBuilder.query(QueryBuilders.termQuery("id",map.get("id").toString())); - searchRequest.source(searchSourceBuilder); - - SearchResponse searchResponse = null; - try { - searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); - } catch (IOException e) { - logger.info("查询ES出现异常:{}",e.getMessage()); - } - - SearchHits hits = searchResponse.getHits(); - SearchHit[] searchHits = hits.getHits(); - if (searchHits != null && searchHits.length > 0) { - // 根据id匹配唯一，所以直接取第一个 - Map sourceAsMap = searchHits[0].getSourceAsMap(); - if (Objects.nonNull(sourceAsMap) && Objects.nonNull(sourceAsMap.get("params")) && StringUtils.isNotEmpty(sourceAsMap.get("params").toString())) { - logger.info("ES查出来的params:{}",sourceAsMap.get("params")); - map.put("params",sourceAsMap.get("params")); - } - } - } - } - if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { - map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); - map.put("params",SecurityUtil.encodeForHtml(map.get("params").toString(), true)); - } - } + List maps = getLocalElogDaoMapper().queryAllMainData(maintableName, mainid); maps = ElogSeviceSwitchUtils.getSwitchDatabaseData(maps); ElogSeviceSwitchUtils.changKey2Lower(maps); List allChangesData = new ArrayList<>(); //如果有分页数据则走分页方法 - if (Objects.nonNull(page) ) { + if (Objects.nonNull(page)) { // Integer offset = (pageNum - 1) * size; //分页查询明细数据 - allChangesData = localElogDaoMapper.queryAllChangesDataPages(tableName, mainid, page); + allChangesData = getLocalElogDaoMapper().queryAllChangesDataPages(tableName, mainid, page); } else { //没有被则不分页 - allChangesData = localElogDaoMapper.queryAllChangesData(tableName, mainid); + allChangesData = getLocalElogDaoMapper().queryAllChangesData(tableName, mainid); } ElogSeviceSwitchUtils.changKey2Lower(allChangesData); allChangesData = ElogSeviceSwitchUtils.getSwitchDatabaseData(allChangesData); @@ -1315,8 +944,8 @@ public class LoggerTableService implements ILoggerTableService { } } } -// List mainlist = localElogDaoMapper.queryAllMainChanges(tableName, mainid); -// List detaillist = localElogDaoMapper.queryAllDetailChanges(tableName, mainid); +// List mainlist = getLocalElogDaoMapper().queryAllMainChanges(tableName, mainid); +// List detaillist = getLocalElogDaoMapper().queryAllDetailChanges(tableName, mainid); //List moduleInfo = queryCommonTabeMapper.queryModuleNameInfo(module); List moduleInfo = new ArrayList<>(); processDetailInfo(mainlist, detaillist, moduleInfo); @@ -1325,34 +954,23 @@ public class LoggerTableService implements ILoggerTableService { map.putAll(detailMap); if (maps != null && maps.size() > 0) { Map maininfoMap = maps.get(0); - String operatetypename = (String)maininfoMap.get("operatetypename"); - String targetname = (String)maininfoMap.get("targetname"); + String operatetypename = (String) maininfoMap.get("operatetypename"); + String targetname = (String) maininfoMap.get("targetname"); //长度大于1避免部分模块为1，2，3这类的操作类型 if (StringUtils.isNumeric(operatetypename) && operatetypename.length() > 1 && operatetypename.length() < 10) { String transfOperatetypename = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(operatetypename), operatetypename); - maininfoMap.put("operatetypename",transfOperatetypename); + maininfoMap.put("operatetypename", transfOperatetypename); } if (StringUtils.isNumeric(targetname) && targetname.length() > 1 && targetname.length() < 10) { String transfTargetname = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(targetname), targetname); - maininfoMap.put("targetname",transfTargetname); + maininfoMap.put("targetname", transfTargetname); } - map.put("maininfo",maininfoMap); + map.put("maininfo", maininfoMap); map.put("detailtitle", ""); } list.add(map); - if (Util.isNotEmpty(detailTransMethod)) { - // 消费到消息,通过MethodHandler调用对应的方法 - MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(detailTransMethod); - if (methodHandler != null) { - try { - methodHandler.execute(list); - } catch (Exception e) { - logger.error("转换出错：" + e); - } - } - } //List transfLanguageData = ElogSeviceSwitchUtils.transfLanguageData(list); return list; @@ -1445,19 +1063,19 @@ public class LoggerTableService implements ILoggerTableService { } @Override - public List queryLogList(String module, String function, String current, String pageSize, String condition) { + public List queryLogList(ELogGetLogParam param) { LoggerContext context = new LoggerContext(); - context.setModuleName(module); - context.setFunctionName(function); - int pagenum = Util.getIntValue(current, 1) - 1; - int size = Util.getIntValue(pageSize, 10); + context.setModuleName(param.getModule()); + context.setFunctionName(param.getFunction()); + int pagenum = Util.getIntValue(param.getCurrent(), 1) - 1; + int size = Util.getIntValue(param.getPageSize(), 10); int start = pagenum * size; int end = start + size; Page page = new Page(pagenum, size); String limit = " limit " + start + "," + (end - start); - String tableName = ElogSeviceUtils.getTableName(module, function); - List list = localElogDaoMapper.queryElogList(page, context, null, tableName, null,"*"); + String tableName = ElogSeviceUtils.getTableName(param.getModule(), param.getFunction()); + List list = getLocalElogDaoMapper().queryElogList(page, context, null, tableName, null, "*"); list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); return switchString(list); } @@ -1502,60 +1120,21 @@ public class LoggerTableService implements ILoggerTableService { String sb = getQueryCondition(filterConditionDtos); logger.info("elog查询条件拼接sql：{}", sb); // 消费到消息,通过MethodHandler调用对应的方法 - //String targetid = getTargetid(filterConditionDtos); - Map customAuthMap = getCustomAuthSql(transMethod, jsonObject, "auth"); - if (!customAuthMap.isEmpty()) { - Object flag = customAuthMap.get("flag"); - if (flag != null && flag instanceof Boolean) { - boolean f = (boolean) flag; - if (!f) { - List list = new ArrayList<>(); - list.add(customAuthMap); - return list; - } - } - } String customSql = getCustomSql(transMethod, sb, "before"); Page pages = new Page(ElogSeviceUtils.getIntValue(pageNum, 1), ElogSeviceUtils.getIntValue(pageSize, 10)); - int page = Util.getIntValue(pages.getCurrent() + "", 1) - 1; - int size = Util.getIntValue(pages.getSize() + "", 10); + int page = Util.getIntValue(pages.getPageNum() + "", 1) - 1; + int size = Util.getIntValue(pages.getPageSize() + "", 10); int start = page * size; int end = start + size; String limit = " limit " + start + "," + (end - start); String tableName = ElogSeviceUtils.getTableName(module, function); - long l = System.currentTimeMillis(); - Map hashMap = addPermissionHandler(transMethod); - String permissionId = ""; - String permissionType = ""; - String mainDataTableAlias = ""; - String mainDataTable = ""; - String primaryKey = ""; - String permissionTargetId = ""; - String permissionConfigSourceId = ""; - - permissionId = getPermissionStr(hashMap, "permissionId"); - permissionType = getPermissionStr(hashMap, "permissionType"); - mainDataTableAlias = getPermissionStr(hashMap, "mainDataTableAlias"); - mainDataTable = getPermissionStr(hashMap, "mainDataTable"); - primaryKey = getPermissionStr(hashMap, "primaryKey"); - permissionTargetId = getPermissionStr(hashMap, "permissionTargetId"); - permissionConfigSourceId = getPermissionStr(hashMap, "permissionConfigSourceId"); //String columns = getshowColumsStr(showColums); List list = new ArrayList<>(); Map countMap = new HashMap<>(); - if (StringUtils.isNotEmpty(permissionId) || StringUtils.isNotEmpty(permissionType) || StringUtils.isNotEmpty(mainDataTableAlias) || StringUtils.isNotEmpty(mainDataTable) || StringUtils.isNotEmpty(permissionTargetId) || StringUtils.isNotEmpty(permissionConfigSourceId)) { - list = localElogDaoMapper.queryElogList(pages, context, null, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey,permissionTargetId,permissionConfigSourceId,"*"); - countMap = localElogDaoMapper.elogCountByMorePermission(context, tableName, customSql, mainDataTable, permissionId, permissionType, mainDataTableAlias, primaryKey, permissionTargetId,permissionConfigSourceId); - } else { - list = localElogDaoMapper.queryElogList(pages, context, null, tableName, customSql,"*"); - long l1 = System.currentTimeMillis(); - logger.info("elog查询列表耗时：{}", (l1 - l)); - countMap = localElogDaoMapper.elogCount(context, tableName, customSql); - long l2 = System.currentTimeMillis(); - logger.info("elog查询总数耗时：{}", (l2 - l1)); - } + list = getLocalElogDaoMapper().queryElogList(pages, context, null, tableName, customSql, "*"); + countMap = getLocalElogDaoMapper().elogCount(context, tableName, customSql); list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); if (list != null && list.size() > 0) { @@ -1564,25 +1143,9 @@ public class LoggerTableService implements ILoggerTableService { //} } transUserInfo(list); - long l3 = System.currentTimeMillis(); //System.out.println("elog查询名称和头像耗时：{}"+ (l3-l2)); transfLanguageData(list, showColums); - if (Util.isNotEmpty(transMethod)) { - // 消费到消息,通过MethodHandler调用对应的方法 - MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(transMethod); - if (methodHandler != null) { - try { - methodHandler.execute(list); - } catch (Exception e) { - logger.error("转换出错：" + e); - } - } - - } - long l4 = System.currentTimeMillis(); - logger.info("elog查询转换耗时：{}", (l4 - l3)); List res = switchString(list); - logger.info("elog查询总耗时：{}", (l4 - l)); return res; } @@ -1610,18 +1173,18 @@ public class LoggerTableService implements ILoggerTableService { } else if (StringUtils.isNotBlank(showColum.getColumIndex()) && showColum.isTransfLanguage() && entry.getKey().equals(showColum.getColumIndex()) && !Objects.isNull(entry.getValue())) { //read view add edit update delete if ("add".equals(entry.getValue().toString()) || "创建".equals(entry.getValue().toString())) { - map.put(entry.getKey(), SystemEnv.getHtmlLabelName(63252, "新增")); + map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(1111111, "新增")); } else if ("read".equals(entry.getValue().toString()) || "view".equals(entry.getValue().toString()) || "查看".equals(entry.getValue().toString())) { - map.put(entry.getKey(), SystemEnv.getHtmlLabelName(55172, "查看")); + map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(1111111, "查看")); } else if ("edit".equals(entry.getValue().toString()) || "update".equals(entry.getValue().toString()) || "更新".equals(entry.getValue().toString())) { - map.put(entry.getKey(), SystemEnv.getHtmlLabelName(63253, "修改")); - } else if ("delete".equals(entry.getValue().toString()) || "删除".equals(entry.getValue().toString()) ) { - map.put(entry.getKey(), SystemEnv.getHtmlLabelName(63254, "删除")); + map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(1111111, "修改")); + } else if ("delete".equals(entry.getValue().toString()) || "删除".equals(entry.getValue().toString())) { + map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(63254, "删除")); } else if (entry.getValue().toString().contains("取消关联标签 ")) { - String val = entry.getValue().toString().replace("取消关联标签 ", SystemEnv.getHtmlLabelName(83237, "取消关联标签 ") + " "); + String val = entry.getValue().toString().replace("取消关联标签 ", SalaryI18nUtil.getI18nLabel(1111111, "取消关联标签 ") + " "); map.put(entry.getKey(), val); } else if (entry.getValue().toString().contains("关联标签 ")) { - String val = entry.getValue().toString().replace("关联标签 ", SystemEnv.getHtmlLabelName(83236, "关联标签 ") + " "); + String val = entry.getValue().toString().replace("关联标签 ", SalaryI18nUtil.getI18nLabel(1111111, "关联标签 ") + " "); map.put(entry.getKey(), val); } } @@ -1641,7 +1204,7 @@ public class LoggerTableService implements ILoggerTableService { context.setFunctionName(function); context.setTenant_key(getTenantKey()); String tableName = ElogSeviceUtils.getTableName(module, function); - return localElogDaoMapper.elogCount(context, tableName, null); + return getLocalElogDaoMapper().elogCount(context, tableName, null); } @Override @@ -1658,7 +1221,7 @@ public class LoggerTableService implements ILoggerTableService { String limit = " limit " + start + "," + (end - start); // 还需要支持下查询 String tableName = ElogSeviceUtils.getTableName(module, function, true); - List list = localElogDaoMapper.queryDetailElogList(context, limit, tableName, null); + List list = getLocalElogDaoMapper().queryDetailElogList(context, limit, tableName, null); list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); return switchString(list); } @@ -1671,7 +1234,7 @@ public class LoggerTableService implements ILoggerTableService { context.setTenant_key(getTenantKey()); context.setUuid(mainId); String tableName = ElogSeviceUtils.getTableName(module, function, true); - return localElogDaoMapper.elogDetailCount(context, tableName, null); + return getLocalElogDaoMapper().elogDetailCount(context, tableName, null); } @Override @@ -1680,32 +1243,17 @@ public class LoggerTableService implements ILoggerTableService { if (StringUtils.isNotEmpty(traceId)) { String tableName = ElogSeviceUtils.getTableName(module, function); Integer offset = (currentPage - 1) * pageSize; - List list = localElogDaoMapper.queryElogTraceInfo(traceId, tableName, offset, pageSize); + List list = getLocalElogDaoMapper().queryElogTraceInfo(traceId, tableName, offset, pageSize); for (Map map : list) { if (map.get("modulename") != null) { map.put("modulenamespan", ElogSeviceSwitchUtils.getModuleName(map.get("modulename").toString())); } } //list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); - int count = localElogDaoMapper.queryElogTraceInfoCount(traceId, tableName); - weaTable.setTotal(count); - Page page = new Page(); - page.setTotal(count); - page.setSize(pageSize); - page.setCurrent(currentPage); - weaTable.setPage(page); - if (Util.isNotEmpty(traceTransMethod)) { - // 消费到消息,通过MethodHandler调用对应的方法 - MethodHandler methodHandler = ElogMethodHandler.loadMethodHandler(traceTransMethod); - if (methodHandler != null) { - try { - methodHandler.execute(list); - } catch (Exception e) { - logger.error("转换出错：" + e); - } - } - } - weaTable.setData(list); + int count = getLocalElogDaoMapper().queryElogTraceInfoCount(traceId, tableName); + PageInfo pageInfo = SalaryPageUtil.buildPage(currentPage, pageSize, list); +// pageInfo.setColumns(); + pageInfo.setTotal(count); } return weaTable; @@ -1719,7 +1267,7 @@ public class LoggerTableService implements ILoggerTableService { StringBuffer sql = new StringBuffer(); sql.append(field).append(" = '").append(value).append("' "); - list = localElogDaoMapper.queryLogInfoByCustom(tableName, sql.toString()); + list = getLocalElogDaoMapper().queryLogInfoByCustom(tableName, sql.toString()); } return list; } @@ -1746,153 +1294,88 @@ public class LoggerTableService implements ILoggerTableService { } } - @Override - public BatchDocumentMessage downloadLog(String data) { - JSONObject jsonObject = JSONObject.parseObject(data); - String module = jsonObject.getString("downloadmodule"); - String function = jsonObject.getString("function"); - String serviceName = jsonObject.getString("serviceName"); - String fileName = jsonObject.getString("fileName"); - String passWord = jsonObject.getString("passWord"); - - if (StringUtils.isEmpty(fileName)) { - fileName = SystemEnv.getHtmlLabelName(191432,"日志记录"); - } - - BatchDocumentMessage batchDocumentMessage = new BatchDocumentMessage(); - WeaTable weaTable = queryLogs(data); - List columns = weaTable.getColumns(); - List headers = new ArrayList<>(); - if (columns != null && !columns.isEmpty()) { - for (WeaTableColumn column : columns) { - Map header = new HashMap<>(); - header.put("key", column.getDataIndex()); - header.put("name", column.getTitle()); - headers.add(header); - } - } - List> dataList = weaTable.getData(); - List> maps = new ArrayList<>(); - if (dataList != null && !dataList.isEmpty()) { - dataList.stream().forEach(m -> { - Map map = new HashMap<>(); - headers.stream().forEach(h -> { - map.put(h.get("key").toString(), m.get(h.get("key"))); - }); - maps.add(map); - }); - } - - //必传--业务id - batchDocumentMessage.setBizId(IdGenerator.generate() + ""); - //必传-处理名称 - batchDocumentMessage.setHandlerName("ebatchdemo"); - //必传-服务名称 - batchDocumentMessage.setServiceName(serviceName); - //必传-数据类型 - batchDocumentMessage.setDataType(fileName); - //任务id - batchDocumentMessage.setBatchTaskId(IdGenerator.generate()); - //必传-模块 - batchDocumentMessage.setModule(module); //com.weaver.teams.domain.EntityType 中的module（没有的话需要找温明刚维护下） - //必传-功能 - batchDocumentMessage.setFunction(function); - //必传-eteamsid - batchDocumentMessage.setEteamsId(TenantRpcContext.getEteamsId()); - - //非必传 - if (StringUtils.isNotBlank(passWord)) { - batchDocumentMessage.setPassword(passWord); - } - - //必传 - BatchFile batchFile = new BatchFile(); - batchFile.setName(fileName); - //必传 - batchFile.setFileType(FileType.EXCEL); - //必传 - batchFile.setHandlerFileMethod(HandlerFileMethod.HANDLER_EXCEL_WITH_DATA); - batchFile.setTemplateId(1l); - List excelSheets = new ArrayList<>(); - ExcelSheet excelSheet = new ExcelSheet(); - - excelSheet.setHeader(headers); - excelSheet.setData(maps); - excelSheet.setName(fileName); - excelSheets.add(excelSheet); - batchFile.setExcelSheets(excelSheets); - batchDocumentMessage.setBatchFile(batchFile); - batchDocumentMessage.setChunk(false);//不分片 - batchExportSender.sendBatchExport(batchDocumentMessage); - - return batchDocumentMessage; - } - - public Boolean checkEsTableIsExist(String date) { - try { - String esMainIndex = getElogESTableName(true, date); - //先检查表是否存在 不存在则创建 - boolean existsLog = isExistsIndex(esMainIndex); - return existsLog; - } catch (Exception e) { - logger.info("创建相关ES表失败:{}", e.getMessage(), e); - } - return false; - } - - /** - * 判断一个索引是否存在 - * - * @param indexName - * @return - */ - public boolean isExistsIndex(String indexName) { - GetIndexRequest request = new GetIndexRequest(); - try { - boolean exists = restHighLevelClient.indices().exists(request.indices(indexName), RequestOptions.DEFAULT); - return exists; - } catch (Exception e) { - logger.info("判断索引是否存在出现异常:{}", e.getMessage()); - - } - return false; - } - - /** - * 创建主表语句 - * - * @throws IOException - */ - private void createLogIndex(String esMainIndex) { - // 1.创建Request对象 - CreateIndexRequest request = new CreateIndexRequest(esMainIndex); - // 2.准备请求的参数：DSL语句 - request.source(MAPPING_TEMPLATE, XContentType.JSON); - // 3.发送请求 - try { - restHighLevelClient.indices().create(request, RequestOptions.DEFAULT); - } catch (IOException e) { - logger.info("创建ES主表失败:{}", e.getMessage()); - - } - } - - private String getElogESTableName(boolean flag, String date) { - String currentDate = ""; - if (StringUtils.isEmpty(date)) { - currentDate = DateUtils.getCurrentDate().replaceAll("-", ""); - } else { - currentDate = date.replaceAll("-", ""); - } - return getEsMainIndex(flag, currentDate); - } - - private String getEsMainIndex(boolean flag, String date) { - if (flag) { - return ElogEsTableConsts.ELOG_CENTER_LOGS_ES + date; - } - return ElogEsTableConsts.ELOG_CENTER_LOGSDETAIL_ES + date; - } +// @Override +// public BatchDocumentMessage downloadLog(String data) { +// JSONObject jsonObject = JSONObject.parseObject(data); +// String module = jsonObject.getString("downloadmodule"); +// String function = jsonObject.getString("function"); +// String serviceName = jsonObject.getString("serviceName"); +// String fileName = jsonObject.getString("fileName"); +// String passWord = jsonObject.getString("passWord"); +// +// if (StringUtils.isEmpty(fileName)) { +// fileName = SalaryI18nUtil.getI18nLabel(191432, "日志记录"); +// } +// +// BatchDocumentMessage batchDocumentMessage = new BatchDocumentMessage(); +// WeaTable weaTable = queryLogs(data); +// List columns = weaTable.getColumns(); +// List headers = new ArrayList<>(); +// if (columns != null && !columns.isEmpty()) { +// for (WeaTableColumn column : columns) { +// Map header = new HashMap<>(); +// header.put("key", column.getDataIndex()); +// header.put("name", column.getTitle()); +// headers.add(header); +// } +// } +// List> dataList = weaTable.getData(); +// List> maps = new ArrayList<>(); +// if (dataList != null && !dataList.isEmpty()) { +// dataList.stream().forEach(m -> { +// Map map = new HashMap<>(); +// headers.stream().forEach(h -> { +// map.put(h.get("key").toString(), m.get(h.get("key"))); +// }); +// maps.add(map); +// }); +// } +// +// //必传--业务id +// batchDocumentMessage.setBizId(IdGenerator.generate() + ""); +// //必传-处理名称 +// batchDocumentMessage.setHandlerName("ebatchdemo"); +// //必传-服务名称 +// batchDocumentMessage.setServiceName(serviceName); +// //必传-数据类型 +// batchDocumentMessage.setDataType(fileName); +// //任务id +// batchDocumentMessage.setBatchTaskId(IdGenerator.generate()); +// //必传-模块 +// batchDocumentMessage.setModule(module); //com.weaver.teams.domain.EntityType 中的module（没有的话需要找温明刚维护下） +// //必传-功能 +// batchDocumentMessage.setFunction(function); +// //必传-eteamsid +// batchDocumentMessage.setEteamsId(TenantRpcContext.getEteamsId()); +// +// //非必传 +// if (StringUtils.isNotBlank(passWord)) { +// batchDocumentMessage.setPassword(passWord); +// } +// +// //必传 +// BatchFile batchFile = new BatchFile(); +// batchFile.setName(fileName); +// //必传 +// batchFile.setFileType(FileType.EXCEL); +// //必传 +// batchFile.setHandlerFileMethod(HandlerFileMethod.HANDLER_EXCEL_WITH_DATA); +// batchFile.setTemplateId(1l); +// List excelSheets = new ArrayList<>(); +// ExcelSheet excelSheet = new ExcelSheet(); +// +// excelSheet.setHeader(headers); +// excelSheet.setData(maps); +// excelSheet.setName(fileName); +// excelSheets.add(excelSheet); +// batchFile.setExcelSheets(excelSheets); +// batchDocumentMessage.setBatchFile(batchFile); +// batchDocumentMessage.setChunk(false);//不分片 +// batchExportSender.sendBatchExport(batchDocumentMessage); +// +// return batchDocumentMessage; +// } +// private String[] getESfields(String value) { String[] split = value.split(","); diff --git a/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java b/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java index 81eb070f0..63e188956 100644 --- a/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java +++ b/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java @@ -1,7 +1,7 @@ package com.engine.salary.elog.threadlocal; import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerContext; import java.util.ArrayList; import java.util.List; diff --git a/src/com/engine/salary/elog/util/ElogServiceUtils.java b/src/com/engine/salary/elog/util/ElogServiceUtils.java index 1e7428366..e06225b36 100644 --- a/src/com/engine/salary/elog/util/ElogServiceUtils.java +++ b/src/com/engine/salary/elog/util/ElogServiceUtils.java @@ -2,9 +2,9 @@ package com.engine.salary.elog.util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.dto.ElogBean; -import com.engine.salary.elog.dto.FilterConditionDto; -import com.engine.salary.elog.dto.ShowColumsDto; +import com.engine.salary.elog.entity.dto.ElogBean; +import com.engine.salary.elog.entity.dto.FilterConditionDto; +import com.engine.salary.elog.entity.dto.ShowColumsDto; import com.engine.salary.elog.enums.ElogConsts; import java.util.List; diff --git a/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java b/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java index f6d55aece..78a78dc94 100644 --- a/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java +++ b/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java @@ -1,1338 +1,1345 @@ -//package com.engine.salary.elog.util; -// -//import cn.hutool.core.map.CaseInsensitiveMap; -//import com.alibaba.druid.proxy.jdbc.ClobProxyImpl; -//import com.alibaba.fastjson.JSON; -//import com.alibaba.fastjson.JSONArray; -//import com.alibaba.fastjson.JSONObject; -//import com.weaver.common.component.table.WeaTable; -//import com.weaver.common.component.table.column.WeaTableColumn; -//import com.weaver.common.elog.annotation.OperateType; -//import com.weaver.common.elog.enums.ElogConsts; -//import com.weaver.common.i18n.label.SystemEnv; -//import com.weaver.common.mybatis.util.DatabaseUtil; -//import com.weaver.common.security.util.SecurityUtil; -//import org.apache.commons.lang3.StringUtils; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -// -//import java.sql.Clob; -//import java.util.*; -//import java.util.regex.Matcher; -//import java.util.regex.Pattern; -// -///** -// * @Date: 2022/5/18 19:34 -// * @Author: deli.xu -// * @Description: elog服务转换类 -// **/ -//public class ElogSeviceSwitchUtils { -// -// private static final Logger logger = LoggerFactory.getLogger(ElogSeviceSwitchUtils.class); -// // TODO 后续需要考虑多语言label写法 -// public static final Map moduleMap = new HashMap<>(); -// -// private static final Map> moduleFuctionMap = new HashMap<>(); -// -// static { -// /*moduleMap.put("elog", SystemEnv.getHtmlLabelName(62975, ElogSeviceUtils.currentLanguage(), "日志")); -// moduleMap.put("report", SystemEnv.getHtmlLabelName(62976, ElogSeviceUtils.currentLanguage(), "报表")); -// moduleMap.put("edc", SystemEnv.getHtmlLabelName(62977, ElogSeviceUtils.currentLanguage(), "数据中心")); -// moduleMap.put("hrm", SystemEnv.getHtmlLabelName(62978, ElogSeviceUtils.currentLanguage(), "人力资源")); -// moduleMap.put("crm", SystemEnv.getHtmlLabelName(62979, ElogSeviceUtils.currentLanguage(), "资产")); -// moduleMap.put("demo", SystemEnv.getHtmlLabelName(62980, ElogSeviceUtils.currentLanguage(), "示例")); -// moduleMap.put("attc", SystemEnv.getHtmlLabelName(62981, ElogSeviceUtils.currentLanguage(), "出勤打卡")); -// moduleMap.put("attm", SystemEnv.getHtmlLabelName(62982, ElogSeviceUtils.currentLanguage(), "出勤机")); -// moduleMap.put("attw", SystemEnv.getHtmlLabelName(62983, ElogSeviceUtils.currentLanguage(), "出勤报表")); -// moduleMap.put("auth", SystemEnv.getHtmlLabelName(62984, ElogSeviceUtils.currentLanguage(), "系统权限")); -// moduleMap.put("bank", SystemEnv.getHtmlLabelName(62985, ElogSeviceUtils.currentLanguage(), "银企直联")); -// moduleMap.put("bap", SystemEnv.getHtmlLabelName(62986, ElogSeviceUtils.currentLanguage(), "云办公")); -// moduleMap.put("base", SystemEnv.getHtmlLabelName(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); -// moduleMap.put("batc", SystemEnv.getHtmlLabelName(62988, ElogSeviceUtils.currentLanguage(), "导入导出")); -// moduleMap.put("blog", SystemEnv.getHtmlLabelName(62989, ElogSeviceUtils.currentLanguage(), "日报微博")); -// moduleMap.put("cld", SystemEnv.getHtmlLabelName(62990, ElogSeviceUtils.currentLanguage(), "日程管理")); -// moduleMap.put("cmca", SystemEnv.getHtmlLabelName(62991, ElogSeviceUtils.currentLanguage(), "资金管理")); -// moduleMap.put("cmcl", SystemEnv.getHtmlLabelName(62992, ElogSeviceUtils.currentLanguage(), "线索管理")); -// moduleMap.put("cmco", SystemEnv.getHtmlLabelName(62993, ElogSeviceUtils.currentLanguage(), "联系人管理")); -// moduleMap.put("cmcp", SystemEnv.getHtmlLabelName(62994, ElogSeviceUtils.currentLanguage(), "对手管理")); -// moduleMap.put("cmcu", SystemEnv.getHtmlLabelName(62995, ElogSeviceUtils.currentLanguage(), "客户管理")); -// moduleMap.put("cmex", SystemEnv.getHtmlLabelName(62996, ElogSeviceUtils.currentLanguage(), "批量操作")); -// moduleMap.put("cmmk", SystemEnv.getHtmlLabelName(62997, ElogSeviceUtils.currentLanguage(), "营销管理")); -// moduleMap.put("cmor", SystemEnv.getHtmlLabelName(62998, ElogSeviceUtils.currentLanguage(), "订单管理")); -// moduleMap.put("cmpc", SystemEnv.getHtmlLabelName(62999, ElogSeviceUtils.currentLanguage(), "价格管理")); -// moduleMap.put("cmpr", SystemEnv.getHtmlLabelName(63000, ElogSeviceUtils.currentLanguage(), "产品管理")); -// moduleMap.put("cmpt", SystemEnv.getHtmlLabelName(63001, ElogSeviceUtils.currentLanguage(), "外部门户")); -// moduleMap.put("cmqu", SystemEnv.getHtmlLabelName(63002, ElogSeviceUtils.currentLanguage(), "报价管理")); -// moduleMap.put("cmsa", SystemEnv.getHtmlLabelName(63003, ElogSeviceUtils.currentLanguage(), "商机管理")); -// moduleMap.put("cmtr", SystemEnv.getHtmlLabelName(63004, ElogSeviceUtils.currentLanguage(), "合同管理")); -// moduleMap.put("comp", SystemEnv.getHtmlLabelName(63005, ElogSeviceUtils.currentLanguage(), "文档对比")); -// moduleMap.put("cs", SystemEnv.getHtmlLabelName(63006, ElogSeviceUtils.currentLanguage(), "云商店")); -// moduleMap.put("cowork", SystemEnv.getHtmlLabelName(63007, ElogSeviceUtils.currentLanguage(), "协作区")); -// moduleMap.put("dbs", SystemEnv.getHtmlLabelName(63008, ElogSeviceUtils.currentLanguage(), "文档公共模块")); -// moduleMap.put("dcad", SystemEnv.getHtmlLabelName(63009, ElogSeviceUtils.currentLanguage(), "数据中心运行")); -// moduleMap.put("dcap", SystemEnv.getHtmlLabelName(63010, ElogSeviceUtils.currentLanguage(), "数据中心分析开发配置")); -// moduleMap.put("dcrd", SystemEnv.getHtmlLabelName(63011, ElogSeviceUtils.currentLanguage(), "数据中心开发配置")); -// moduleMap.put("dcre", SystemEnv.getHtmlLabelName(63012, ElogSeviceUtils.currentLanguage(), "数据中心分析生产运行")); -// moduleMap.put("dcs", SystemEnv.getHtmlLabelName(63013, ElogSeviceUtils.currentLanguage(), "文档目录模块")); -// moduleMap.put("dds", SystemEnv.getHtmlLabelName(63014, ElogSeviceUtils.currentLanguage(), "文档模块")); -// moduleMap.put("dps", SystemEnv.getHtmlLabelName(63015, ElogSeviceUtils.currentLanguage(), "文档权限模块")); -// moduleMap.put("drle", SystemEnv.getHtmlLabelName(63016, ElogSeviceUtils.currentLanguage(), "数据规则库")); -// moduleMap.put("ds", SystemEnv.getHtmlLabelName(63017, ElogSeviceUtils.currentLanguage(), "数据安全")); -// moduleMap.put("dw_etl", SystemEnv.getHtmlLabelName(63018, ElogSeviceUtils.currentLanguage(), "ETL(抽取，转换，治理）")); -// moduleMap.put("dw_model", SystemEnv.getHtmlLabelName(63019, ElogSeviceUtils.currentLanguage(), "建模服务")); -// moduleMap.put("dw_process", SystemEnv.getHtmlLabelName(63020, ElogSeviceUtils.currentLanguage(), "计算服务")); -// moduleMap.put("dw_search", SystemEnv.getHtmlLabelName(63021, ElogSeviceUtils.currentLanguage(), "查询服务")); -// moduleMap.put("dw_sync", SystemEnv.getHtmlLabelName(63022, ElogSeviceUtils.currentLanguage(), "数据抽取")); -// moduleMap.put("eb", SystemEnv.getHtmlLabelName(63023, ElogSeviceUtils.currentLanguage(), "云桥")); -// moduleMap.put("ebda", SystemEnv.getHtmlLabelName(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); -// moduleMap.put("ebdd", SystemEnv.getHtmlLabelName(63024, ElogSeviceUtils.currentLanguage(), "页面设计")); -// moduleMap.put("ebdf", SystemEnv.getHtmlLabelName(63025, ElogSeviceUtils.currentLanguage(), "表单服务")); -// moduleMap.put("ebdp", SystemEnv.getHtmlLabelName(63026, ElogSeviceUtils.currentLanguage(), "页面管理")); -// moduleMap.put("ecod", SystemEnv.getHtmlLabelName(63027, ElogSeviceUtils.currentLanguage(), "ecode")); -// moduleMap.put("ei", SystemEnv.getHtmlLabelName(63028, ElogSeviceUtils.currentLanguage(), "数据导出导入")); -// moduleMap.put("em", SystemEnv.getHtmlLabelName(63029, ElogSeviceUtils.currentLanguage(), "移动相关")); -// moduleMap.put("es", SystemEnv.getHtmlLabelName(63030, ElogSeviceUtils.currentLanguage(), "微搜搜索")); -// moduleMap.put("esa", SystemEnv.getHtmlLabelName(63031, ElogSeviceUtils.currentLanguage(), "微搜文件分析")); -// moduleMap.put("esb", SystemEnv.getHtmlLabelName(63032, ElogSeviceUtils.currentLanguage(), "ESB")); -// moduleMap.put("esch", SystemEnv.getHtmlLabelName(63033, ElogSeviceUtils.currentLanguage(), "计划任务")); -// moduleMap.put("esd", SystemEnv.getHtmlLabelName(63034, ElogSeviceUtils.currentLanguage(), "微搜索引数据")); -// moduleMap.put("exfo", SystemEnv.getHtmlLabelName(63035, ElogSeviceUtils.currentLanguage(), "excel函数引擎")); -// moduleMap.put("fbdg", SystemEnv.getHtmlLabelName(63036, ElogSeviceUtils.currentLanguage(), "预算编制")); -// moduleMap.put("fdt", SystemEnv.getHtmlLabelName(63037, ElogSeviceUtils.currentLanguage(), "表单数据")); -// moduleMap.put("fexs", SystemEnv.getHtmlLabelName(63038, ElogSeviceUtils.currentLanguage(), "费用管理")); -// moduleMap.put("file", SystemEnv.getHtmlLabelName(63039, ElogSeviceUtils.currentLanguage(), "文件服务")); -// moduleMap.put("finc", SystemEnv.getHtmlLabelName(63040, ElogSeviceUtils.currentLanguage(), "微报账")); -// moduleMap.put("fnar", SystemEnv.getHtmlLabelName(63041, ElogSeviceUtils.currentLanguage(), "财务报表")); -// moduleMap.put("fomo", SystemEnv.getHtmlLabelName(63042, ElogSeviceUtils.currentLanguage(), "表单监控")); -// moduleMap.put("form", SystemEnv.getHtmlLabelName(63043, ElogSeviceUtils.currentLanguage(), "表单服务")); -// moduleMap.put("frpt", SystemEnv.getHtmlLabelName(63043, ElogSeviceUtils.currentLanguage(), "业务表单")); -// moduleMap.put("fvou", SystemEnv.getHtmlLabelName(63044, ElogSeviceUtils.currentLanguage(), "凭证集成")); -// moduleMap.put("hp", SystemEnv.getHtmlLabelName(63045, ElogSeviceUtils.currentLanguage(), "门户")); -// moduleMap.put("hr", SystemEnv.getHtmlLabelName(63046, ElogSeviceUtils.currentLanguage(), "人事档案")); -// moduleMap.put("ic", SystemEnv.getHtmlLabelName(63047, ElogSeviceUtils.currentLanguage(), "集成服务")); -// moduleMap.put("il", SystemEnv.getHtmlLabelName(63048, ElogSeviceUtils.currentLanguage(), "集成登录")); -// moduleMap.put("im", SystemEnv.getHtmlLabelName(63049, ElogSeviceUtils.currentLanguage(), "IM相关服务")); -// moduleMap.put("inc", SystemEnv.getHtmlLabelName(63050, ElogSeviceUtils.currentLanguage(), "发票云服务")); -// moduleMap.put("iua", SystemEnv.getHtmlLabelName(63051, ElogSeviceUtils.currentLanguage(), "统一认证")); -// moduleMap.put("iut", SystemEnv.getHtmlLabelName(63052, ElogSeviceUtils.currentLanguage(), "统一待办")); -// moduleMap.put("mail", SystemEnv.getHtmlLabelName(63053, ElogSeviceUtils.currentLanguage(), "邮件服务")); -// moduleMap.put("mc", SystemEnv.getHtmlLabelName(63054, ElogSeviceUtils.currentLanguage(), "消息服务")); -// moduleMap.put("mt", SystemEnv.getHtmlLabelName(63055, ElogSeviceUtils.currentLanguage(), "会议管理")); -// moduleMap.put("my", SystemEnv.getHtmlLabelName(63056, ElogSeviceUtils.currentLanguage(), "关注&收藏&标签")); -// moduleMap.put("odoc", SystemEnv.getHtmlLabelName(63057, ElogSeviceUtils.currentLanguage(), "公文管理")); -// moduleMap.put("odoc_exchange", SystemEnv.getHtmlLabelName(63058, ElogSeviceUtils.currentLanguage(), "公文交换平台")); -// moduleMap.put("open", SystemEnv.getHtmlLabelName(63059, ElogSeviceUtils.currentLanguage(), "开放平台")); -// moduleMap.put("pr", SystemEnv.getHtmlLabelName(63060, ElogSeviceUtils.currentLanguage(), "工作画像")); -// moduleMap.put("proj", SystemEnv.getHtmlLabelName(63061, ElogSeviceUtils.currentLanguage(), "项目管理")); -// moduleMap.put("prt", SystemEnv.getHtmlLabelName(63062, ElogSeviceUtils.currentLanguage(), "打印服务")); -// moduleMap.put("pspt", SystemEnv.getHtmlLabelName(63063, ElogSeviceUtils.currentLanguage(), "系统登录")); -// moduleMap.put("rptc", SystemEnv.getHtmlLabelName(63064, ElogSeviceUtils.currentLanguage(), "数据协作")); -// moduleMap.put("rpts", SystemEnv.getHtmlLabelName(63065, ElogSeviceUtils.currentLanguage(), "上报调查")); -// moduleMap.put("sala", SystemEnv.getHtmlLabelName(63066, ElogSeviceUtils.currentLanguage(), "薪资管理")); -// moduleMap.put("sign", SystemEnv.getHtmlLabelName(63067, ElogSeviceUtils.currentLanguage(), "印控中心")); -// moduleMap.put("sms", SystemEnv.getHtmlLabelName(63068, ElogSeviceUtils.currentLanguage(), "短信")); -// moduleMap.put("task", SystemEnv.getHtmlLabelName(63069, ElogSeviceUtils.currentLanguage(), "任务管理")); -// moduleMap.put("tnt", SystemEnv.getHtmlLabelName(63070, ElogSeviceUtils.currentLanguage(), "租户管理")); -// moduleMap.put("wf", SystemEnv.getHtmlLabelName(63071, ElogSeviceUtils.currentLanguage(), "路径定义")); -// moduleMap.put("wfc", SystemEnv.getHtmlLabelName(63072, ElogSeviceUtils.currentLanguage(), "流程流转")); -// moduleMap.put("wfr", SystemEnv.getHtmlLabelName(63073, ElogSeviceUtils.currentLanguage(), "流程规则路由")); -// moduleMap.put("wrgm", SystemEnv.getHtmlLabelName(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); -// moduleMap.put("wrgp", SystemEnv.getHtmlLabelName(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); -// moduleMap.put("wrpr", SystemEnv.getHtmlLabelName(63076, ElogSeviceUtils.currentLanguage(), "计划报告")); -// moduleMap.put("doc", SystemEnv.getHtmlLabelName(63077, ElogSeviceUtils.currentLanguage(), "文档服务")); -// moduleMap.put("placard", SystemEnv.getHtmlLabelName(63078, ElogSeviceUtils.currentLanguage(), "团队公告")); -// moduleMap.put("fna", SystemEnv.getHtmlLabelName(135042, ElogSeviceUtils.currentLanguage(), "云报销")); -// moduleMap.put("meeting", SystemEnv.getHtmlLabelName(63080, ElogSeviceUtils.currentLanguage(), "会议")); -// moduleMap.put("wfp", SystemEnv.getHtmlLabelName(63081, ElogSeviceUtils.currentLanguage(), "流程")); -// moduleMap.put("portal", SystemEnv.getHtmlLabelName(63045, ElogSeviceUtils.currentLanguage(), "门户")); -// moduleMap.put("workreport", SystemEnv.getHtmlLabelName(63082, ElogSeviceUtils.currentLanguage(), "工作报告")); -// moduleMap.put("goal", SystemEnv.getHtmlLabelName(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); -// moduleMap.put("performance", SystemEnv.getHtmlLabelName(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); -// moduleMap.put("intlogin", SystemEnv.getHtmlLabelName(63083, ElogSeviceUtils.currentLanguage(), "集成登录设置")); -// moduleMap.put("i18n", SystemEnv.getHtmlLabelName(64559, ElogSeviceUtils.currentLanguage(), "国际化")); -// moduleMap.put("timecard", SystemEnv.getHtmlLabelName(63085, ElogSeviceUtils.currentLanguage(), "出勤")); -// moduleMap.put("market", SystemEnv.getHtmlLabelName(63086, ElogSeviceUtils.currentLanguage(), "营销")); -// moduleMap.put("excelformula", SystemEnv.getHtmlLabelName(64560, ElogSeviceUtils.currentLanguage(), "函数服务")); -// moduleMap.put("ic_ldap", SystemEnv.getHtmlLabelName(70081, ElogSeviceUtils.currentLanguage(), "Ldap集成")); -// moduleMap.put("iut_c_c", SystemEnv.getHtmlLabelName(70303, ElogSeviceUtils.currentLanguage(), "统一待办推送设置")); -// moduleMap.put("plan", SystemEnv.getHtmlLabelName(70303, ElogSeviceUtils.currentLanguage(), "计划报告")); -// moduleMap.put("document", SystemEnv.getHtmlLabelName(34218, ElogSeviceUtils.currentLanguage(), "文档")); -// moduleMap.put("taskCustStatus", SystemEnv.getHtmlLabelName(73988, ElogSeviceUtils.currentLanguage(), "任务状态")); -// moduleMap.put("project", SystemEnv.getHtmlLabelName(55158, ElogSeviceUtils.currentLanguage(), "项目")); -// moduleMap.put("calendar", SystemEnv.getHtmlLabelName(74186, ElogSeviceUtils.currentLanguage(), "日历")); -// moduleMap.put("web", SystemEnv.getHtmlLabelName(75598, ElogSeviceUtils.currentLanguage(), "浏览")); -// moduleMap.put("formdatareport", SystemEnv.getHtmlLabelName(76068, ElogSeviceUtils.currentLanguage(), "来自上报数据")); -// moduleMap.put("mainline", SystemEnv.getHtmlLabelName(31898, ElogSeviceUtils.currentLanguage(), "主线")); -// moduleMap.put("customer", SystemEnv.getHtmlLabelName(32726, ElogSeviceUtils.currentLanguage(), "客户")); -// moduleMap.put("contract", SystemEnv.getHtmlLabelName(32864, ElogSeviceUtils.currentLanguage(), "合同")); -// moduleMap.put("group", SystemEnv.getHtmlLabelName(19426, ElogSeviceUtils.currentLanguage(), "分组")); -// moduleMap.put("workflow", SystemEnv.getHtmlLabelName(81851, ElogSeviceUtils.currentLanguage(), "工作流程")); -// moduleMap.put("biaoge", SystemEnv.getHtmlLabelName(30919, ElogSeviceUtils.currentLanguage(), "表格")); -// moduleMap.put("clue", SystemEnv.getHtmlLabelName(28908, ElogSeviceUtils.currentLanguage(), "线索")); -// moduleMap.put("competitor", SystemEnv.getHtmlLabelName(81852, ElogSeviceUtils.currentLanguage(), "竞争对手")); -// moduleMap.put("kpiFlow", SystemEnv.getHtmlLabelName(81853, ElogSeviceUtils.currentLanguage(), "kpil流程")); -// moduleMap.put("mainlineCustStatus", SystemEnv.getHtmlLabelName(81854, ElogSeviceUtils.currentLanguage(), "主线客户状态")); -// moduleMap.put("marketactivity", SystemEnv.getHtmlLabelName(34221, ElogSeviceUtils.currentLanguage(), "市场活动")); -// moduleMap.put("mtPhase", SystemEnv.getHtmlLabelName(81855, ElogSeviceUtils.currentLanguage(), "mt阶段")); -// moduleMap.put("production", SystemEnv.getHtmlLabelName(29329, ElogSeviceUtils.currentLanguage(), "产品")); -// moduleMap.put("quote", SystemEnv.getHtmlLabelName(34231, ElogSeviceUtils.currentLanguage(), "报价")); -// moduleMap.put("saleChance", SystemEnv.getHtmlLabelName(32863, ElogSeviceUtils.currentLanguage(), "商机")); -// moduleMap.put("orderform", SystemEnv.getHtmlLabelName(34230, ElogSeviceUtils.currentLanguage(), "订单")); -// moduleMap.put("contact", SystemEnv.getHtmlLabelName(32711, ElogSeviceUtils.currentLanguage(), "联系人")); -// moduleMap.put("price", SystemEnv.getHtmlLabelName(31922, ElogSeviceUtils.currentLanguage(), "价格")); -// moduleMap.put("capital", SystemEnv.getHtmlLabelName(83428, ElogSeviceUtils.currentLanguage(), "资金")); -// moduleMap.put("ice", SystemEnv.getHtmlLabelName(94360, ElogSeviceUtils.currentLanguage(), "日程会议集成")); -// moduleMap.put("ic_hr", SystemEnv.getHtmlLabelName(84284, ElogSeviceUtils.currentLanguage(), "HR同步")); -// moduleMap.put("intunifyauth", SystemEnv.getHtmlLabelName(84467, ElogSeviceUtils.currentLanguage(), "统一认证接入管理")); -// moduleMap.put("signcenter", SystemEnv.getHtmlLabelName(84691, ElogSeviceUtils.currentLanguage(), "电子签")); -// moduleMap.put("iut_s_c", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办-异构系统")); -// moduleMap.put("iut_s_c1", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统")); -// moduleMap.put("iut_s_c2", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办中心")); -// moduleMap.put("iut_s_c3", SystemEnv.getHtmlLabelName(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统-流程类型")); -// moduleMap.put("ic_mail", SystemEnv.getHtmlLabelName(100715, ElogSeviceUtils.currentLanguage(), "邮箱集成")); -// moduleMap.put("hrsa", SystemEnv.getHtmlLabelName(105038, ElogSeviceUtils.currentLanguage(), "薪酬管理")); -// moduleMap.put("icc", SystemEnv.getHtmlLabelName(113884, ElogSeviceUtils.currentLanguage(), "转换规则")); -// moduleMap.put("basicserver", SystemEnv.getHtmlLabelName(113885, ElogSeviceUtils.currentLanguage(), "整体基础")); -// moduleMap.put("dw", SystemEnv.getHtmlLabelName(115549, ElogSeviceUtils.currentLanguage(), "数据仓库")); -// moduleMap.put("msg", SystemEnv.getHtmlLabelName(115563, ElogSeviceUtils.currentLanguage(), "工作消息")); -// moduleMap.put("intunifybase", SystemEnv.getHtmlLabelName(115599, ElogSeviceUtils.currentLanguage(), "统一认证服务")); -// moduleMap.put("esearch", SystemEnv.getHtmlLabelName(21694, ElogSeviceUtils.currentLanguage(), "全文检索")); -// moduleMap.put("iaauthserver", SystemEnv.getHtmlLabelName(115603, ElogSeviceUtils.currentLanguage(), "统一认证注册应用")); -// moduleMap.put("excel", SystemEnv.getHtmlLabelName(115543, ElogSeviceUtils.currentLanguage(), "excel函数")); -// moduleMap.put("scene", SystemEnv.getHtmlLabelName(115539, ElogSeviceUtils.currentLanguage(), "绘图")); -// moduleMap.put("bcw", SystemEnv.getHtmlLabelName(115651, ElogSeviceUtils.currentLanguage(), "公共模块")); -// moduleMap.put("folder", SystemEnv.getHtmlLabelName(10734, ElogSeviceUtils.currentLanguage(), "文件夹")); -// moduleMap.put("pdfcnv", SystemEnv.getHtmlLabelName(115957, ElogSeviceUtils.currentLanguage(), "PDF转换服务")); -// moduleMap.put("ebform", SystemEnv.getHtmlLabelName(121462, ElogSeviceUtils.currentLanguage(), "e-Builder表单")); -// moduleMap.put("statistics", SystemEnv.getHtmlLabelName(17745, ElogSeviceUtils.currentLanguage(), "自定义统计")); -// moduleMap.put("edcapp", SystemEnv.getHtmlLabelName(121631, ElogSeviceUtils.currentLanguage(), "多级填报")); -// -// */ -// -// moduleMap.put("elog", 62975); -// moduleMap.put("report", 62976); -// moduleMap.put("edc", 52689); -// moduleMap.put("hrm", 62978); -// moduleMap.put("crm", 62979); -// moduleMap.put("demo", 62980); -// moduleMap.put("attc", 62981); -// moduleMap.put("attm", 62982); -// moduleMap.put("attw", 62983); -// moduleMap.put("auth", 62984); -// moduleMap.put("bank", 62985); -// moduleMap.put("bap", 62986); -// moduleMap.put("base", 62987); -// moduleMap.put("batc", 62988); -// moduleMap.put("blog", 62989); -// moduleMap.put("cld", 62990); -// moduleMap.put("cmca", 62991); -// moduleMap.put("cmcl", 62992); -// moduleMap.put("cmco", 62993); -// moduleMap.put("cmcp", 62994); -// moduleMap.put("cmcu", 62995); -// moduleMap.put("cmex", 62996); -// moduleMap.put("cmmk", 62997); -// moduleMap.put("cmor", 62998); -// moduleMap.put("cmpc", 62999); -// moduleMap.put("cmpr", 63000); -// moduleMap.put("cmpt", 63001); -// moduleMap.put("cmqu", 63002); -// moduleMap.put("cmsa", 63003); -// moduleMap.put("cmtr", 63004); -// moduleMap.put("comp", 63005); -// moduleMap.put("cs", 63006); -// moduleMap.put("cowork", 63007); -// moduleMap.put("dbs", 63008); -// moduleMap.put("dcad", 63009); -// moduleMap.put("dcap", 63010); -// moduleMap.put("dcrd", 63011); -// moduleMap.put("dcre", 63012); -// moduleMap.put("dcs", 63013); -// moduleMap.put("dds", 63014); -// moduleMap.put("dps", 63015); -// moduleMap.put("drle", 63016); -// moduleMap.put("ds", 63017); -// moduleMap.put("dw_etl", 63018); -// moduleMap.put("dw_model", 63019); -// moduleMap.put("dw_process", 63020); -// moduleMap.put("dw_search", 63021); -// moduleMap.put("dw_sync", 63022); -// moduleMap.put("eb", 63023); -// moduleMap.put("ebda", 62987); -// moduleMap.put("ebdd", 63024); -// moduleMap.put("ebdf", 63025); -// moduleMap.put("ebdp", 63026); -// moduleMap.put("ecod", 63027); -// moduleMap.put("ei", 63028); -// moduleMap.put("em", 63029); -// moduleMap.put("es", 63030); -// moduleMap.put("esa", 63031); -// moduleMap.put("esb", 63032); -// moduleMap.put("esch", 63033); -// moduleMap.put("esd", 63034); -// moduleMap.put("exfo", 63035); -// moduleMap.put("fbdg", 63036); -// moduleMap.put("fdt",63037); -// moduleMap.put("fexs", 63038); -// moduleMap.put("file", 63039); -// moduleMap.put("finc", 63040); -// moduleMap.put("fnar", 63041); -// moduleMap.put("fomo", 63042); -// moduleMap.put("form", 63043); -// moduleMap.put("frpt", 63043); -// moduleMap.put("fvou", 63044); -// moduleMap.put("hp", 63045); -// moduleMap.put("hr", 63046); -// moduleMap.put("ic", 63047); -// moduleMap.put("il", 63048); -// moduleMap.put("im", 63049); -// moduleMap.put("inc", 63050); -// moduleMap.put("iua", 63051); -// moduleMap.put("iut", 63052); -// moduleMap.put("mail", 63053); -// moduleMap.put("mc", 63054); -// moduleMap.put("mt", 63055); -// moduleMap.put("my", 63056); -// moduleMap.put("odoc", 63057); -// moduleMap.put("odoc_exchange", 63058); -// moduleMap.put("open", 63059); -// moduleMap.put("pr", 63060); -// moduleMap.put("proj", 63061); -// moduleMap.put("prt", 63062); -// moduleMap.put("pspt", 63063); -// moduleMap.put("rptc", 63064); -// moduleMap.put("rpts", 63065); -// moduleMap.put("sala", 63066); -// moduleMap.put("sign", 63067); -// moduleMap.put("sms", 63068); -// moduleMap.put("task", 63069); -// moduleMap.put("tnt", 63070); -// moduleMap.put("wf", 63071); -// moduleMap.put("wfc", 63072); -// moduleMap.put("wfr", 63073); -// moduleMap.put("wrgm", 63074); -// moduleMap.put("wrgp", 63075); -// moduleMap.put("wrpr", 63076); -// moduleMap.put("doc", 63077); -// moduleMap.put("placard", 63078); -// moduleMap.put("fna", 135042); -// moduleMap.put("meeting", 63080); -// moduleMap.put("wfp", 63081); -// moduleMap.put("portal", 63045); -// moduleMap.put("workreport", 63082); -// moduleMap.put("goal", 63074); -// moduleMap.put("performance", 63075); -// moduleMap.put("intlogin", 63083); -// moduleMap.put("i18n", 64559); -// moduleMap.put("timecard", 63085); -// moduleMap.put("market", 63086); -// moduleMap.put("excelformula", 64560); -// moduleMap.put("ebatch", 69280); -// moduleMap.put("ic_ldap", 70081); -// moduleMap.put("iut_c_c", 96493); -// moduleMap.put("plan", 63076); -// moduleMap.put("document", 34218); -// moduleMap.put("taskCustStatus", 73988); -// moduleMap.put("calendar", 74186); -// moduleMap.put("batch", 69280); -// moduleMap.put("project", 55158); -// moduleMap.put("web", 75598); -// moduleMap.put("formdatareport", 76068); -// moduleMap.put("mainline", 31898); -// moduleMap.put("customer", 32726); -// moduleMap.put("contract", 32864); -// moduleMap.put("group", 19426); -// moduleMap.put("workflow", 81851); -// moduleMap.put("biaoge", 30919); -// moduleMap.put("clue", 28908); -// moduleMap.put("competitor", 81852); -// moduleMap.put("kpiFlow", 81853); -// moduleMap.put("mainlineCustStatus", 81854); -// moduleMap.put("marketactivity", 34221); -// moduleMap.put("mtPhase", 81855); -// moduleMap.put("production", 29329); -// moduleMap.put("quote", 34231); -// moduleMap.put("saleChance", 32863); -// moduleMap.put("orderform", 34230); -// moduleMap.put("contact", 32711); -// moduleMap.put("price", 31922); -// moduleMap.put("capital", 83428); -// moduleMap.put("ice", 87722); -// moduleMap.put("ic_hr", 84284); -// moduleMap.put("intunifyauth", 84508); -// moduleMap.put("signcenter", 84691); -// moduleMap.put("iut_s_c", 91503); -// moduleMap.put("iut_s_c1", 95218); -// moduleMap.put("iut_s_c2", 95219); -// moduleMap.put("iut_s_c3", 95220); -// moduleMap.put("iut_c_log", 96494); -// moduleMap.put("ic_mail", 100715); -// moduleMap.put("hrsa", 105038); -// moduleMap.put("icc", 113884); -// moduleMap.put("basicserver", 113885); -// moduleMap.put("dw", 115549); -// moduleMap.put("msg", 115563); -// moduleMap.put("intunifybase", 115599); -// moduleMap.put("esearch", 21694); -// moduleMap.put("iaauthserver", 115603); -// moduleMap.put("excel", 115543); -// moduleMap.put("scene", 115539); -// moduleMap.put("bcw", 115651); -// moduleMap.put("folder", 10734); -// moduleMap.put("pdfcnv", 115957); -// moduleMap.put("login", 63063); -// moduleMap.put("ebform", 121462); -// moduleMap.put("statistics", 17745); -// moduleMap.put("edcapp", 121631); -// moduleMap.put("cusapp", 16381); -// moduleMap.put("e10-allinone-base", 141083); -// moduleMap.put("voice", 142713); -// moduleMap.put("filter", 147832); -// moduleMap.put("ias", 146674); -// moduleMap.put("device", 153666); -// moduleMap.put("meetingTopic", 180274); -// moduleMap.put("meetingService", 180276); -// moduleMap.put("meetingDecision", 180277); -// moduleMap.put("meetingSign", 180278); -// moduleMap.put("meetingSignSet", 61601); -// moduleMap.put("meetingMember", 180280); -// moduleMap.put("meetingShare", 180281); -// moduleMap.put("int", 40031); -// moduleMap.put("print", 160051); -// moduleMap.put("wcwIconUpdate", 182661); -// moduleMap.put("wcwIconRelease", 183123); -// moduleMap.put("wcwIconUse", 183124); -// moduleMap.put("wcw", 29385); -// moduleMap.put("component", 115651); -// moduleMap.put("ic_exchange", 87722); -// moduleMap.put("iut_c_c", 240048); -// moduleMap.put("iut_c_set", 240049); -// -// Map elogMap = new HashMap<>(); -// Map reportMap = new HashMap<>(); -// Map edcMap = new HashMap<>(); -// Map hrmMap = new HashMap<>(); -// Map crmMap = new HashMap<>(); -// Map demoMap = new HashMap<>(); -// -// moduleFuctionMap.put("elog", elogMap); -// moduleFuctionMap.put("report", reportMap); -// moduleFuctionMap.put("edc", edcMap); -// moduleFuctionMap.put("hrm", hrmMap); -// moduleFuctionMap.put("crm", crmMap); -// moduleFuctionMap.put("demo", demoMap); -// -// -// -// elogMap.put("operator", "日志操作"); -// elogMap.put("reportcusinfo","报表自定义"); -// edcMap.put("dataset","数据集合"); -// -// demoMap.put("reportcusinfo","报表自定义字段"); -// } -// -// /** -// * 获取模块名称 -// * @param module -// * @return -// */ -// public static String getModuleName(String module) { +package com.engine.salary.elog.util; + +import cn.hutool.core.map.CaseInsensitiveMap; +import com.alibaba.druid.proxy.jdbc.ClobProxyImpl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.cloudstore.eccom.pc.table.WeaTable; +import com.cloudstore.eccom.pc.table.WeaTableColumn; +import com.engine.salary.elog.annotation.OperateType; +import com.engine.salary.elog.enums.ElogConsts; +import com.engine.salary.util.SalaryI18nUtil; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import weaver.conn.RecordSet; + +import java.sql.Clob; +import java.util.*; + +/** + * @Date: 2022/5/18 19:34 + * @Author: deli.xu + * @Description: elog服务转换类 + **/ +public class ElogSeviceSwitchUtils { + + private static final Logger logger = LoggerFactory.getLogger(ElogSeviceSwitchUtils.class); + // TODO 后续需要考虑多语言label写法 + public static final Map moduleMap = new HashMap<>(); + + private static final Map> moduleFuctionMap = new HashMap<>(); + + static { + /*moduleMap.put("elog", SalaryI18nUtil.getI18nLabel(62975, ElogSeviceUtils.currentLanguage(), "日志")); + moduleMap.put("report", SalaryI18nUtil.getI18nLabel(62976, ElogSeviceUtils.currentLanguage(), "报表")); + moduleMap.put("edc", SalaryI18nUtil.getI18nLabel(62977, ElogSeviceUtils.currentLanguage(), "数据中心")); + moduleMap.put("hrm", SalaryI18nUtil.getI18nLabel(62978, ElogSeviceUtils.currentLanguage(), "人力资源")); + moduleMap.put("crm", SalaryI18nUtil.getI18nLabel(62979, ElogSeviceUtils.currentLanguage(), "资产")); + moduleMap.put("demo", SalaryI18nUtil.getI18nLabel(62980, ElogSeviceUtils.currentLanguage(), "示例")); + moduleMap.put("attc", SalaryI18nUtil.getI18nLabel(62981, ElogSeviceUtils.currentLanguage(), "出勤打卡")); + moduleMap.put("attm", SalaryI18nUtil.getI18nLabel(62982, ElogSeviceUtils.currentLanguage(), "出勤机")); + moduleMap.put("attw", SalaryI18nUtil.getI18nLabel(62983, ElogSeviceUtils.currentLanguage(), "出勤报表")); + moduleMap.put("auth", SalaryI18nUtil.getI18nLabel(62984, ElogSeviceUtils.currentLanguage(), "系统权限")); + moduleMap.put("bank", SalaryI18nUtil.getI18nLabel(62985, ElogSeviceUtils.currentLanguage(), "银企直联")); + moduleMap.put("bap", SalaryI18nUtil.getI18nLabel(62986, ElogSeviceUtils.currentLanguage(), "云办公")); + moduleMap.put("base", SalaryI18nUtil.getI18nLabel(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); + moduleMap.put("batc", SalaryI18nUtil.getI18nLabel(62988, ElogSeviceUtils.currentLanguage(), "导入导出")); + moduleMap.put("blog", SalaryI18nUtil.getI18nLabel(62989, ElogSeviceUtils.currentLanguage(), "日报微博")); + moduleMap.put("cld", SalaryI18nUtil.getI18nLabel(62990, ElogSeviceUtils.currentLanguage(), "日程管理")); + moduleMap.put("cmca", SalaryI18nUtil.getI18nLabel(62991, ElogSeviceUtils.currentLanguage(), "资金管理")); + moduleMap.put("cmcl", SalaryI18nUtil.getI18nLabel(62992, ElogSeviceUtils.currentLanguage(), "线索管理")); + moduleMap.put("cmco", SalaryI18nUtil.getI18nLabel(62993, ElogSeviceUtils.currentLanguage(), "联系人管理")); + moduleMap.put("cmcp", SalaryI18nUtil.getI18nLabel(62994, ElogSeviceUtils.currentLanguage(), "对手管理")); + moduleMap.put("cmcu", SalaryI18nUtil.getI18nLabel(62995, ElogSeviceUtils.currentLanguage(), "客户管理")); + moduleMap.put("cmex", SalaryI18nUtil.getI18nLabel(62996, ElogSeviceUtils.currentLanguage(), "批量操作")); + moduleMap.put("cmmk", SalaryI18nUtil.getI18nLabel(62997, ElogSeviceUtils.currentLanguage(), "营销管理")); + moduleMap.put("cmor", SalaryI18nUtil.getI18nLabel(62998, ElogSeviceUtils.currentLanguage(), "订单管理")); + moduleMap.put("cmpc", SalaryI18nUtil.getI18nLabel(62999, ElogSeviceUtils.currentLanguage(), "价格管理")); + moduleMap.put("cmpr", SalaryI18nUtil.getI18nLabel(63000, ElogSeviceUtils.currentLanguage(), "产品管理")); + moduleMap.put("cmpt", SalaryI18nUtil.getI18nLabel(63001, ElogSeviceUtils.currentLanguage(), "外部门户")); + moduleMap.put("cmqu", SalaryI18nUtil.getI18nLabel(63002, ElogSeviceUtils.currentLanguage(), "报价管理")); + moduleMap.put("cmsa", SalaryI18nUtil.getI18nLabel(63003, ElogSeviceUtils.currentLanguage(), "商机管理")); + moduleMap.put("cmtr", SalaryI18nUtil.getI18nLabel(63004, ElogSeviceUtils.currentLanguage(), "合同管理")); + moduleMap.put("comp", SalaryI18nUtil.getI18nLabel(63005, ElogSeviceUtils.currentLanguage(), "文档对比")); + moduleMap.put("cs", SalaryI18nUtil.getI18nLabel(63006, ElogSeviceUtils.currentLanguage(), "云商店")); + moduleMap.put("cowork", SalaryI18nUtil.getI18nLabel(63007, ElogSeviceUtils.currentLanguage(), "协作区")); + moduleMap.put("dbs", SalaryI18nUtil.getI18nLabel(63008, ElogSeviceUtils.currentLanguage(), "文档公共模块")); + moduleMap.put("dcad", SalaryI18nUtil.getI18nLabel(63009, ElogSeviceUtils.currentLanguage(), "数据中心运行")); + moduleMap.put("dcap", SalaryI18nUtil.getI18nLabel(63010, ElogSeviceUtils.currentLanguage(), "数据中心分析开发配置")); + moduleMap.put("dcrd", SalaryI18nUtil.getI18nLabel(63011, ElogSeviceUtils.currentLanguage(), "数据中心开发配置")); + moduleMap.put("dcre", SalaryI18nUtil.getI18nLabel(63012, ElogSeviceUtils.currentLanguage(), "数据中心分析生产运行")); + moduleMap.put("dcs", SalaryI18nUtil.getI18nLabel(63013, ElogSeviceUtils.currentLanguage(), "文档目录模块")); + moduleMap.put("dds", SalaryI18nUtil.getI18nLabel(63014, ElogSeviceUtils.currentLanguage(), "文档模块")); + moduleMap.put("dps", SalaryI18nUtil.getI18nLabel(63015, ElogSeviceUtils.currentLanguage(), "文档权限模块")); + moduleMap.put("drle", SalaryI18nUtil.getI18nLabel(63016, ElogSeviceUtils.currentLanguage(), "数据规则库")); + moduleMap.put("ds", SalaryI18nUtil.getI18nLabel(63017, ElogSeviceUtils.currentLanguage(), "数据安全")); + moduleMap.put("dw_etl", SalaryI18nUtil.getI18nLabel(63018, ElogSeviceUtils.currentLanguage(), "ETL(抽取，转换，治理）")); + moduleMap.put("dw_model", SalaryI18nUtil.getI18nLabel(63019, ElogSeviceUtils.currentLanguage(), "建模服务")); + moduleMap.put("dw_process", SalaryI18nUtil.getI18nLabel(63020, ElogSeviceUtils.currentLanguage(), "计算服务")); + moduleMap.put("dw_search", SalaryI18nUtil.getI18nLabel(63021, ElogSeviceUtils.currentLanguage(), "查询服务")); + moduleMap.put("dw_sync", SalaryI18nUtil.getI18nLabel(63022, ElogSeviceUtils.currentLanguage(), "数据抽取")); + moduleMap.put("eb", SalaryI18nUtil.getI18nLabel(63023, ElogSeviceUtils.currentLanguage(), "云桥")); + moduleMap.put("ebda", SalaryI18nUtil.getI18nLabel(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); + moduleMap.put("ebdd", SalaryI18nUtil.getI18nLabel(63024, ElogSeviceUtils.currentLanguage(), "页面设计")); + moduleMap.put("ebdf", SalaryI18nUtil.getI18nLabel(63025, ElogSeviceUtils.currentLanguage(), "表单服务")); + moduleMap.put("ebdp", SalaryI18nUtil.getI18nLabel(63026, ElogSeviceUtils.currentLanguage(), "页面管理")); + moduleMap.put("ecod", SalaryI18nUtil.getI18nLabel(63027, ElogSeviceUtils.currentLanguage(), "ecode")); + moduleMap.put("ei", SalaryI18nUtil.getI18nLabel(63028, ElogSeviceUtils.currentLanguage(), "数据导出导入")); + moduleMap.put("em", SalaryI18nUtil.getI18nLabel(63029, ElogSeviceUtils.currentLanguage(), "移动相关")); + moduleMap.put("es", SalaryI18nUtil.getI18nLabel(63030, ElogSeviceUtils.currentLanguage(), "微搜搜索")); + moduleMap.put("esa", SalaryI18nUtil.getI18nLabel(63031, ElogSeviceUtils.currentLanguage(), "微搜文件分析")); + moduleMap.put("esb", SalaryI18nUtil.getI18nLabel(63032, ElogSeviceUtils.currentLanguage(), "ESB")); + moduleMap.put("esch", SalaryI18nUtil.getI18nLabel(63033, ElogSeviceUtils.currentLanguage(), "计划任务")); + moduleMap.put("esd", SalaryI18nUtil.getI18nLabel(63034, ElogSeviceUtils.currentLanguage(), "微搜索引数据")); + moduleMap.put("exfo", SalaryI18nUtil.getI18nLabel(63035, ElogSeviceUtils.currentLanguage(), "excel函数引擎")); + moduleMap.put("fbdg", SalaryI18nUtil.getI18nLabel(63036, ElogSeviceUtils.currentLanguage(), "预算编制")); + moduleMap.put("fdt", SalaryI18nUtil.getI18nLabel(63037, ElogSeviceUtils.currentLanguage(), "表单数据")); + moduleMap.put("fexs", SalaryI18nUtil.getI18nLabel(63038, ElogSeviceUtils.currentLanguage(), "费用管理")); + moduleMap.put("file", SalaryI18nUtil.getI18nLabel(63039, ElogSeviceUtils.currentLanguage(), "文件服务")); + moduleMap.put("finc", SalaryI18nUtil.getI18nLabel(63040, ElogSeviceUtils.currentLanguage(), "微报账")); + moduleMap.put("fnar", SalaryI18nUtil.getI18nLabel(63041, ElogSeviceUtils.currentLanguage(), "财务报表")); + moduleMap.put("fomo", SalaryI18nUtil.getI18nLabel(63042, ElogSeviceUtils.currentLanguage(), "表单监控")); + moduleMap.put("form", SalaryI18nUtil.getI18nLabel(63043, ElogSeviceUtils.currentLanguage(), "表单服务")); + moduleMap.put("frpt", SalaryI18nUtil.getI18nLabel(63043, ElogSeviceUtils.currentLanguage(), "业务表单")); + moduleMap.put("fvou", SalaryI18nUtil.getI18nLabel(63044, ElogSeviceUtils.currentLanguage(), "凭证集成")); + moduleMap.put("hp", SalaryI18nUtil.getI18nLabel(63045, ElogSeviceUtils.currentLanguage(), "门户")); + moduleMap.put("hr", SalaryI18nUtil.getI18nLabel(63046, ElogSeviceUtils.currentLanguage(), "人事档案")); + moduleMap.put("ic", SalaryI18nUtil.getI18nLabel(63047, ElogSeviceUtils.currentLanguage(), "集成服务")); + moduleMap.put("il", SalaryI18nUtil.getI18nLabel(63048, ElogSeviceUtils.currentLanguage(), "集成登录")); + moduleMap.put("im", SalaryI18nUtil.getI18nLabel(63049, ElogSeviceUtils.currentLanguage(), "IM相关服务")); + moduleMap.put("inc", SalaryI18nUtil.getI18nLabel(63050, ElogSeviceUtils.currentLanguage(), "发票云服务")); + moduleMap.put("iua", SalaryI18nUtil.getI18nLabel(63051, ElogSeviceUtils.currentLanguage(), "统一认证")); + moduleMap.put("iut", SalaryI18nUtil.getI18nLabel(63052, ElogSeviceUtils.currentLanguage(), "统一待办")); + moduleMap.put("mail", SalaryI18nUtil.getI18nLabel(63053, ElogSeviceUtils.currentLanguage(), "邮件服务")); + moduleMap.put("mc", SalaryI18nUtil.getI18nLabel(63054, ElogSeviceUtils.currentLanguage(), "消息服务")); + moduleMap.put("mt", SalaryI18nUtil.getI18nLabel(63055, ElogSeviceUtils.currentLanguage(), "会议管理")); + moduleMap.put("my", SalaryI18nUtil.getI18nLabel(63056, ElogSeviceUtils.currentLanguage(), "关注&收藏&标签")); + moduleMap.put("odoc", SalaryI18nUtil.getI18nLabel(63057, ElogSeviceUtils.currentLanguage(), "公文管理")); + moduleMap.put("odoc_exchange", SalaryI18nUtil.getI18nLabel(63058, ElogSeviceUtils.currentLanguage(), "公文交换平台")); + moduleMap.put("open", SalaryI18nUtil.getI18nLabel(63059, ElogSeviceUtils.currentLanguage(), "开放平台")); + moduleMap.put("pr", SalaryI18nUtil.getI18nLabel(63060, ElogSeviceUtils.currentLanguage(), "工作画像")); + moduleMap.put("proj", SalaryI18nUtil.getI18nLabel(63061, ElogSeviceUtils.currentLanguage(), "项目管理")); + moduleMap.put("prt", SalaryI18nUtil.getI18nLabel(63062, ElogSeviceUtils.currentLanguage(), "打印服务")); + moduleMap.put("pspt", SalaryI18nUtil.getI18nLabel(63063, ElogSeviceUtils.currentLanguage(), "系统登录")); + moduleMap.put("rptc", SalaryI18nUtil.getI18nLabel(63064, ElogSeviceUtils.currentLanguage(), "数据协作")); + moduleMap.put("rpts", SalaryI18nUtil.getI18nLabel(63065, ElogSeviceUtils.currentLanguage(), "上报调查")); + moduleMap.put("sala", SalaryI18nUtil.getI18nLabel(63066, ElogSeviceUtils.currentLanguage(), "薪资管理")); + moduleMap.put("sign", SalaryI18nUtil.getI18nLabel(63067, ElogSeviceUtils.currentLanguage(), "印控中心")); + moduleMap.put("sms", SalaryI18nUtil.getI18nLabel(63068, ElogSeviceUtils.currentLanguage(), "短信")); + moduleMap.put("task", SalaryI18nUtil.getI18nLabel(63069, ElogSeviceUtils.currentLanguage(), "任务管理")); + moduleMap.put("tnt", SalaryI18nUtil.getI18nLabel(63070, ElogSeviceUtils.currentLanguage(), "租户管理")); + moduleMap.put("wf", SalaryI18nUtil.getI18nLabel(63071, ElogSeviceUtils.currentLanguage(), "路径定义")); + moduleMap.put("wfc", SalaryI18nUtil.getI18nLabel(63072, ElogSeviceUtils.currentLanguage(), "流程流转")); + moduleMap.put("wfr", SalaryI18nUtil.getI18nLabel(63073, ElogSeviceUtils.currentLanguage(), "流程规则路由")); + moduleMap.put("wrgm", SalaryI18nUtil.getI18nLabel(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); + moduleMap.put("wrgp", SalaryI18nUtil.getI18nLabel(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); + moduleMap.put("wrpr", SalaryI18nUtil.getI18nLabel(63076, ElogSeviceUtils.currentLanguage(), "计划报告")); + moduleMap.put("doc", SalaryI18nUtil.getI18nLabel(63077, ElogSeviceUtils.currentLanguage(), "文档服务")); + moduleMap.put("placard", SalaryI18nUtil.getI18nLabel(63078, ElogSeviceUtils.currentLanguage(), "团队公告")); + moduleMap.put("fna", SalaryI18nUtil.getI18nLabel(135042, ElogSeviceUtils.currentLanguage(), "云报销")); + moduleMap.put("meeting", SalaryI18nUtil.getI18nLabel(63080, ElogSeviceUtils.currentLanguage(), "会议")); + moduleMap.put("wfp", SalaryI18nUtil.getI18nLabel(63081, ElogSeviceUtils.currentLanguage(), "流程")); + moduleMap.put("portal", SalaryI18nUtil.getI18nLabel(63045, ElogSeviceUtils.currentLanguage(), "门户")); + moduleMap.put("workreport", SalaryI18nUtil.getI18nLabel(63082, ElogSeviceUtils.currentLanguage(), "工作报告")); + moduleMap.put("goal", SalaryI18nUtil.getI18nLabel(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); + moduleMap.put("performance", SalaryI18nUtil.getI18nLabel(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); + moduleMap.put("intlogin", SalaryI18nUtil.getI18nLabel(63083, ElogSeviceUtils.currentLanguage(), "集成登录设置")); + moduleMap.put("i18n", SalaryI18nUtil.getI18nLabel(64559, ElogSeviceUtils.currentLanguage(), "国际化")); + moduleMap.put("timecard", SalaryI18nUtil.getI18nLabel(63085, ElogSeviceUtils.currentLanguage(), "出勤")); + moduleMap.put("market", SalaryI18nUtil.getI18nLabel(63086, ElogSeviceUtils.currentLanguage(), "营销")); + moduleMap.put("excelformula", SalaryI18nUtil.getI18nLabel(64560, ElogSeviceUtils.currentLanguage(), "函数服务")); + moduleMap.put("ic_ldap", SalaryI18nUtil.getI18nLabel(70081, ElogSeviceUtils.currentLanguage(), "Ldap集成")); + moduleMap.put("iut_c_c", SalaryI18nUtil.getI18nLabel(70303, ElogSeviceUtils.currentLanguage(), "统一待办推送设置")); + moduleMap.put("plan", SalaryI18nUtil.getI18nLabel(70303, ElogSeviceUtils.currentLanguage(), "计划报告")); + moduleMap.put("document", SalaryI18nUtil.getI18nLabel(34218, ElogSeviceUtils.currentLanguage(), "文档")); + moduleMap.put("taskCustStatus", SalaryI18nUtil.getI18nLabel(73988, ElogSeviceUtils.currentLanguage(), "任务状态")); + moduleMap.put("project", SalaryI18nUtil.getI18nLabel(55158, ElogSeviceUtils.currentLanguage(), "项目")); + moduleMap.put("calendar", SalaryI18nUtil.getI18nLabel(74186, ElogSeviceUtils.currentLanguage(), "日历")); + moduleMap.put("web", SalaryI18nUtil.getI18nLabel(75598, ElogSeviceUtils.currentLanguage(), "浏览")); + moduleMap.put("formdatareport", SalaryI18nUtil.getI18nLabel(76068, ElogSeviceUtils.currentLanguage(), "来自上报数据")); + moduleMap.put("mainline", SalaryI18nUtil.getI18nLabel(31898, ElogSeviceUtils.currentLanguage(), "主线")); + moduleMap.put("customer", SalaryI18nUtil.getI18nLabel(32726, ElogSeviceUtils.currentLanguage(), "客户")); + moduleMap.put("contract", SalaryI18nUtil.getI18nLabel(32864, ElogSeviceUtils.currentLanguage(), "合同")); + moduleMap.put("group", SalaryI18nUtil.getI18nLabel(19426, ElogSeviceUtils.currentLanguage(), "分组")); + moduleMap.put("workflow", SalaryI18nUtil.getI18nLabel(81851, ElogSeviceUtils.currentLanguage(), "工作流程")); + moduleMap.put("biaoge", SalaryI18nUtil.getI18nLabel(30919, ElogSeviceUtils.currentLanguage(), "表格")); + moduleMap.put("clue", SalaryI18nUtil.getI18nLabel(28908, ElogSeviceUtils.currentLanguage(), "线索")); + moduleMap.put("competitor", SalaryI18nUtil.getI18nLabel(81852, ElogSeviceUtils.currentLanguage(), "竞争对手")); + moduleMap.put("kpiFlow", SalaryI18nUtil.getI18nLabel(81853, ElogSeviceUtils.currentLanguage(), "kpil流程")); + moduleMap.put("mainlineCustStatus", SalaryI18nUtil.getI18nLabel(81854, ElogSeviceUtils.currentLanguage(), "主线客户状态")); + moduleMap.put("marketactivity", SalaryI18nUtil.getI18nLabel(34221, ElogSeviceUtils.currentLanguage(), "市场活动")); + moduleMap.put("mtPhase", SalaryI18nUtil.getI18nLabel(81855, ElogSeviceUtils.currentLanguage(), "mt阶段")); + moduleMap.put("production", SalaryI18nUtil.getI18nLabel(29329, ElogSeviceUtils.currentLanguage(), "产品")); + moduleMap.put("quote", SalaryI18nUtil.getI18nLabel(34231, ElogSeviceUtils.currentLanguage(), "报价")); + moduleMap.put("saleChance", SalaryI18nUtil.getI18nLabel(32863, ElogSeviceUtils.currentLanguage(), "商机")); + moduleMap.put("orderform", SalaryI18nUtil.getI18nLabel(34230, ElogSeviceUtils.currentLanguage(), "订单")); + moduleMap.put("contact", SalaryI18nUtil.getI18nLabel(32711, ElogSeviceUtils.currentLanguage(), "联系人")); + moduleMap.put("price", SalaryI18nUtil.getI18nLabel(31922, ElogSeviceUtils.currentLanguage(), "价格")); + moduleMap.put("capital", SalaryI18nUtil.getI18nLabel(83428, ElogSeviceUtils.currentLanguage(), "资金")); + moduleMap.put("ice", SalaryI18nUtil.getI18nLabel(94360, ElogSeviceUtils.currentLanguage(), "日程会议集成")); + moduleMap.put("ic_hr", SalaryI18nUtil.getI18nLabel(84284, ElogSeviceUtils.currentLanguage(), "HR同步")); + moduleMap.put("intunifyauth", SalaryI18nUtil.getI18nLabel(84467, ElogSeviceUtils.currentLanguage(), "统一认证接入管理")); + moduleMap.put("signcenter", SalaryI18nUtil.getI18nLabel(84691, ElogSeviceUtils.currentLanguage(), "电子签")); + moduleMap.put("iut_s_c", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办-异构系统")); + moduleMap.put("iut_s_c1", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统")); + moduleMap.put("iut_s_c2", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办中心")); + moduleMap.put("iut_s_c3", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统-流程类型")); + moduleMap.put("ic_mail", SalaryI18nUtil.getI18nLabel(100715, ElogSeviceUtils.currentLanguage(), "邮箱集成")); + moduleMap.put("hrsa", SalaryI18nUtil.getI18nLabel(105038, ElogSeviceUtils.currentLanguage(), "薪酬管理")); + moduleMap.put("icc", SalaryI18nUtil.getI18nLabel(113884, ElogSeviceUtils.currentLanguage(), "转换规则")); + moduleMap.put("basicserver", SalaryI18nUtil.getI18nLabel(113885, ElogSeviceUtils.currentLanguage(), "整体基础")); + moduleMap.put("dw", SalaryI18nUtil.getI18nLabel(115549, ElogSeviceUtils.currentLanguage(), "数据仓库")); + moduleMap.put("msg", SalaryI18nUtil.getI18nLabel(115563, ElogSeviceUtils.currentLanguage(), "工作消息")); + moduleMap.put("intunifybase", SalaryI18nUtil.getI18nLabel(115599, ElogSeviceUtils.currentLanguage(), "统一认证服务")); + moduleMap.put("esearch", SalaryI18nUtil.getI18nLabel(21694, ElogSeviceUtils.currentLanguage(), "全文检索")); + moduleMap.put("iaauthserver", SalaryI18nUtil.getI18nLabel(115603, ElogSeviceUtils.currentLanguage(), "统一认证注册应用")); + moduleMap.put("excel", SalaryI18nUtil.getI18nLabel(115543, ElogSeviceUtils.currentLanguage(), "excel函数")); + moduleMap.put("scene", SalaryI18nUtil.getI18nLabel(115539, ElogSeviceUtils.currentLanguage(), "绘图")); + moduleMap.put("bcw", SalaryI18nUtil.getI18nLabel(115651, ElogSeviceUtils.currentLanguage(), "公共模块")); + moduleMap.put("folder", SalaryI18nUtil.getI18nLabel(10734, ElogSeviceUtils.currentLanguage(), "文件夹")); + moduleMap.put("pdfcnv", SalaryI18nUtil.getI18nLabel(115957, ElogSeviceUtils.currentLanguage(), "PDF转换服务")); + moduleMap.put("ebform", SalaryI18nUtil.getI18nLabel(121462, ElogSeviceUtils.currentLanguage(), "e-Builder表单")); + moduleMap.put("statistics", SalaryI18nUtil.getI18nLabel(17745, ElogSeviceUtils.currentLanguage(), "自定义统计")); + moduleMap.put("edcapp", SalaryI18nUtil.getI18nLabel(121631, ElogSeviceUtils.currentLanguage(), "多级填报")); + + */ + + moduleMap.put("elog", 62975); + moduleMap.put("report", 62976); + moduleMap.put("edc", 52689); + moduleMap.put("hrm", 62978); + moduleMap.put("crm", 62979); + moduleMap.put("demo", 62980); + moduleMap.put("attc", 62981); + moduleMap.put("attm", 62982); + moduleMap.put("attw", 62983); + moduleMap.put("auth", 62984); + moduleMap.put("bank", 62985); + moduleMap.put("bap", 62986); + moduleMap.put("base", 62987); + moduleMap.put("batc", 62988); + moduleMap.put("blog", 62989); + moduleMap.put("cld", 62990); + moduleMap.put("cmca", 62991); + moduleMap.put("cmcl", 62992); + moduleMap.put("cmco", 62993); + moduleMap.put("cmcp", 62994); + moduleMap.put("cmcu", 62995); + moduleMap.put("cmex", 62996); + moduleMap.put("cmmk", 62997); + moduleMap.put("cmor", 62998); + moduleMap.put("cmpc", 62999); + moduleMap.put("cmpr", 63000); + moduleMap.put("cmpt", 63001); + moduleMap.put("cmqu", 63002); + moduleMap.put("cmsa", 63003); + moduleMap.put("cmtr", 63004); + moduleMap.put("comp", 63005); + moduleMap.put("cs", 63006); + moduleMap.put("cowork", 63007); + moduleMap.put("dbs", 63008); + moduleMap.put("dcad", 63009); + moduleMap.put("dcap", 63010); + moduleMap.put("dcrd", 63011); + moduleMap.put("dcre", 63012); + moduleMap.put("dcs", 63013); + moduleMap.put("dds", 63014); + moduleMap.put("dps", 63015); + moduleMap.put("drle", 63016); + moduleMap.put("ds", 63017); + moduleMap.put("dw_etl", 63018); + moduleMap.put("dw_model", 63019); + moduleMap.put("dw_process", 63020); + moduleMap.put("dw_search", 63021); + moduleMap.put("dw_sync", 63022); + moduleMap.put("eb", 63023); + moduleMap.put("ebda", 62987); + moduleMap.put("ebdd", 63024); + moduleMap.put("ebdf", 63025); + moduleMap.put("ebdp", 63026); + moduleMap.put("ecod", 63027); + moduleMap.put("ei", 63028); + moduleMap.put("em", 63029); + moduleMap.put("es", 63030); + moduleMap.put("esa", 63031); + moduleMap.put("esb", 63032); + moduleMap.put("esch", 63033); + moduleMap.put("esd", 63034); + moduleMap.put("exfo", 63035); + moduleMap.put("fbdg", 63036); + moduleMap.put("fdt", 63037); + moduleMap.put("fexs", 63038); + moduleMap.put("file", 63039); + moduleMap.put("finc", 63040); + moduleMap.put("fnar", 63041); + moduleMap.put("fomo", 63042); + moduleMap.put("form", 63043); + moduleMap.put("frpt", 63043); + moduleMap.put("fvou", 63044); + moduleMap.put("hp", 63045); + moduleMap.put("hr", 63046); + moduleMap.put("ic", 63047); + moduleMap.put("il", 63048); + moduleMap.put("im", 63049); + moduleMap.put("inc", 63050); + moduleMap.put("iua", 63051); + moduleMap.put("iut", 63052); + moduleMap.put("mail", 63053); + moduleMap.put("mc", 63054); + moduleMap.put("mt", 63055); + moduleMap.put("my", 63056); + moduleMap.put("odoc", 63057); + moduleMap.put("odoc_exchange", 63058); + moduleMap.put("open", 63059); + moduleMap.put("pr", 63060); + moduleMap.put("proj", 63061); + moduleMap.put("prt", 63062); + moduleMap.put("pspt", 63063); + moduleMap.put("rptc", 63064); + moduleMap.put("rpts", 63065); + moduleMap.put("sala", 63066); + moduleMap.put("sign", 63067); + moduleMap.put("sms", 63068); + moduleMap.put("task", 63069); + moduleMap.put("tnt", 63070); + moduleMap.put("wf", 63071); + moduleMap.put("wfc", 63072); + moduleMap.put("wfr", 63073); + moduleMap.put("wrgm", 63074); + moduleMap.put("wrgp", 63075); + moduleMap.put("wrpr", 63076); + moduleMap.put("doc", 63077); + moduleMap.put("placard", 63078); + moduleMap.put("fna", 135042); + moduleMap.put("meeting", 63080); + moduleMap.put("wfp", 63081); + moduleMap.put("portal", 63045); + moduleMap.put("workreport", 63082); + moduleMap.put("goal", 63074); + moduleMap.put("performance", 63075); + moduleMap.put("intlogin", 63083); + moduleMap.put("i18n", 64559); + moduleMap.put("timecard", 63085); + moduleMap.put("market", 63086); + moduleMap.put("excelformula", 64560); + moduleMap.put("ebatch", 69280); + moduleMap.put("ic_ldap", 70081); + moduleMap.put("iut_c_c", 96493); + moduleMap.put("plan", 63076); + moduleMap.put("document", 34218); + moduleMap.put("taskCustStatus", 73988); + moduleMap.put("calendar", 74186); + moduleMap.put("batch", 69280); + moduleMap.put("project", 55158); + moduleMap.put("web", 75598); + moduleMap.put("formdatareport", 76068); + moduleMap.put("mainline", 31898); + moduleMap.put("customer", 32726); + moduleMap.put("contract", 32864); + moduleMap.put("group", 19426); + moduleMap.put("workflow", 81851); + moduleMap.put("biaoge", 30919); + moduleMap.put("clue", 28908); + moduleMap.put("competitor", 81852); + moduleMap.put("kpiFlow", 81853); + moduleMap.put("mainlineCustStatus", 81854); + moduleMap.put("marketactivity", 34221); + moduleMap.put("mtPhase", 81855); + moduleMap.put("production", 29329); + moduleMap.put("quote", 34231); + moduleMap.put("saleChance", 32863); + moduleMap.put("orderform", 34230); + moduleMap.put("contact", 32711); + moduleMap.put("price", 31922); + moduleMap.put("capital", 83428); + moduleMap.put("ice", 87722); + moduleMap.put("ic_hr", 84284); + moduleMap.put("intunifyauth", 84508); + moduleMap.put("signcenter", 84691); + moduleMap.put("iut_s_c", 91503); + moduleMap.put("iut_s_c1", 95218); + moduleMap.put("iut_s_c2", 95219); + moduleMap.put("iut_s_c3", 95220); + moduleMap.put("iut_c_log", 96494); + moduleMap.put("ic_mail", 100715); + moduleMap.put("hrsa", 105038); + moduleMap.put("icc", 113884); + moduleMap.put("basicserver", 113885); + moduleMap.put("dw", 115549); + moduleMap.put("msg", 115563); + moduleMap.put("intunifybase", 115599); + moduleMap.put("esearch", 21694); + moduleMap.put("iaauthserver", 115603); + moduleMap.put("excel", 115543); + moduleMap.put("scene", 115539); + moduleMap.put("bcw", 115651); + moduleMap.put("folder", 10734); + moduleMap.put("pdfcnv", 115957); + moduleMap.put("login", 63063); + moduleMap.put("ebform", 121462); + moduleMap.put("statistics", 17745); + moduleMap.put("edcapp", 121631); + moduleMap.put("cusapp", 16381); + moduleMap.put("e10-allinone-base", 141083); + moduleMap.put("voice", 142713); + moduleMap.put("filter", 147832); + moduleMap.put("ias", 146674); + moduleMap.put("device", 153666); + moduleMap.put("meetingTopic", 180274); + moduleMap.put("meetingService", 180276); + moduleMap.put("meetingDecision", 180277); + moduleMap.put("meetingSign", 180278); + moduleMap.put("meetingSignSet", 61601); + moduleMap.put("meetingMember", 180280); + moduleMap.put("meetingShare", 180281); + moduleMap.put("int", 40031); + moduleMap.put("print", 160051); + moduleMap.put("wcwIconUpdate", 182661); + moduleMap.put("wcwIconRelease", 183123); + moduleMap.put("wcwIconUse", 183124); + moduleMap.put("wcw", 29385); + moduleMap.put("component", 115651); + moduleMap.put("ic_exchange", 87722); + moduleMap.put("iut_c_c", 240048); + moduleMap.put("iut_c_set", 240049); + + Map elogMap = new HashMap<>(); + Map reportMap = new HashMap<>(); + Map edcMap = new HashMap<>(); + Map hrmMap = new HashMap<>(); + Map crmMap = new HashMap<>(); + Map demoMap = new HashMap<>(); + + moduleFuctionMap.put("elog", elogMap); + moduleFuctionMap.put("report", reportMap); + moduleFuctionMap.put("edc", edcMap); + moduleFuctionMap.put("hrm", hrmMap); + moduleFuctionMap.put("crm", crmMap); + moduleFuctionMap.put("demo", demoMap); + + + elogMap.put("operator", "日志操作"); + elogMap.put("reportcusinfo", "报表自定义"); + edcMap.put("dataset", "数据集合"); + + demoMap.put("reportcusinfo", "报表自定义字段"); + } + + /** + * 获取模块名称 + * + * @param module + * @return + */ + public static String getModuleName(String module) { // String modulename = ElogSeviceUtils.null2String(moduleMap.get(module), module); -// -// return ElogSeviceUtils.isLongValue(modulename) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(modulename),modulename) : modulename; -// } -// -// /** -// * 获取模块名称 -// * @param module -// * @return -// */ -// public static String getModuleNamePapi(String module) { +// return ElogSeviceUtils.isLongValue(modulename) ? SalaryI18nUtil.getI18nLabel(ElogSeviceUtils.getLongValue(modulename), modulename) : modulename; + return module; + } + + /** + * 获取模块名称 + * + * @param module + * @return + */ + public static String getModuleNamePapi(String module) { // String modulename = ElogSeviceUtils.null2String(moduleMap.get(module), module); -// -// return ElogSeviceUtils.isLongValue(modulename) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(modulename),modulename) : modulename; -// } -// -// -// /** -// * 获取方法名称 -// * @param module -// * @param function -// * @return -// */ -// public static String getFunctionName(String module, String function) { +// return ElogSeviceUtils.isLongValue(modulename) ? SalaryI18nUtil.getI18nLabel(ElogSeviceUtils.getLongValue(modulename), modulename) : modulename; + return module; + } + + + /** + * 获取方法名称 + * + * @param module + * @param function + * @return + */ + public static String getFunctionName(String module, String function) { // Map functionMap = moduleFuctionMap.get(module); // -// if(functionMap != null) -// function = ElogSeviceUtils.null2String(functionMap.get(function),function); +// if (functionMap != null) +// function = ElogSeviceUtils.null2String(functionMap.get(function), function); // -// return ElogSeviceUtils.isLongValue(function) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(function),function) : function; -// } -// -// public static void switchValues(List resultMap, List recordColumns) { -// -// switchValues(resultMap,recordColumns,false); -// -// } -// -// -// public static void switchValues(List list,List recordColumns, boolean islocal) { -//// if(!islocal) { -//// changKey2Lower(list); -//// } -// for(Map map : list) { -// Iterator> iterator = map.entrySet().iterator(); -// while (iterator.hasNext()) { -// Map.Entry next = iterator.next(); -// for (String recordColumn : recordColumns) { -// if (next.getKey().equals(recordColumn) && next.getValue() instanceof String) { -// map.put(next.getKey(), transfi18Method(next.getValue())); -// } -// } -// } -// map.put("modulenamespan", getModuleName(map.get("modulename"))); -// //map.put("functionnamespan", getFunctionName(map.get("modulename"), map.get("functionname"))); -// //switchDatabaseField(map); +// return ElogSeviceUtils.isLongValue(function) ? SalaryI18nUtil.getI18nLabel(ElogSeviceUtils.getLongValue(function), function) : function; + return function; + } + + public static void switchValues(List resultMap, List recordColumns) { + + switchValues(resultMap, recordColumns, false); + + } + + + public static void switchValues(List list, List recordColumns, boolean islocal) { +// if(!islocal) { +// changKey2Lower(list); // } -// -// } -// -// public static void switchDatabaseField(Map map) { -// map.put("date", map.get("log_date")); -// map.put("operator", map.get("log_operator")); -// map.put("result", map.get("log_result")); -// } -// -// /** -// * 转换数据成多语言 -// * @param lists -// */ -// public static List transfLanguageData(List lists) { -// if (lists != null && lists.size() > 0) { -// for (Map map : lists) { -// if (map != null) { -// Iterator> iterator = map.entrySet().iterator(); -// while (iterator.hasNext()) { -// Map.Entry entry = iterator.next(); -// if (entry.getValue() instanceof Integer ||entry.getValue() instanceof Long||entry.getValue()instanceof String) { -// map.put(entry.getKey(), transfLanguageLableid(ElogSeviceUtils.getLongValue(entry.getValue().toString()),entry.getValue().toString())); -// }else{ -// map.put(entry.getKey(), entry.getValue()); -// } -// } -// } -// } -// } -// return lists; -// } -// -// public static String transfi18Method(String str) { -// if ("新增".equals(str)){ -// return transfLanguageLableid(63252l,str); -// } else if ("查看".equals(str)) { -// return transfLanguageLableid(55172l,str); -// }else if ("修改".equals(str)) { -// return transfLanguageLableid(63253l,str); -// }else if ("更新".equals(str)) { -// return transfLanguageLableid(29540l,str); -// }else if ("删除".equals(str)) { -// return transfLanguageLableid(63254l,str); -// }else if (StringUtils.isNumeric(str) && str.length()< 10) { -// return transfLanguageLableid(Long.parseLong(str),str); -// }else { -// return str; -// } -// } -// -// public static String transfLanguageLableid(Long lableid) { -// return SystemEnv.getHtmlLabelName(lableid, lableid.toString()); -// } -// -// /** -// * 转换多语言 -// * @param lableid -// * @param def -// * @return -// */ -// public static String transfLanguageLableid(Long lableid,String def) { -// return SystemEnv.getHtmlLabelName(lableid, def); -// } -// -// -// /** -// * 日志本地服务-更新明细转换 -// * -// * @param mainlist -// * @param list -// * @return -// */ -// public static Map switchChangeValue(List mainlist, List list) { -// Map res = new HashMap<>(); -// StringBuilder valuesChange = new StringBuilder(); -// List valuesChanges = new ArrayList<>(); -// String values = ""; -// String operatetypeName = ""; -// int oldCount = 0; -// int newCount = 0; -// String operatetype = ""; -// CaseInsensitiveMap map = null; -// if (list != null && list.size() > 0) { -// for (Map hashmap : list) { -// map = new CaseInsensitiveMap<>(hashmap); -// Object obj = map.get("operatetype"); -// if (obj != null) { -// operatetype = obj.toString(); -// } -// } -// } -// if (mainlist != null && mainlist.size() > 0) { -// for (Map hashMap : mainlist) { -// map = new CaseInsensitiveMap<>(hashMap); -// Object isdetail = map.get("isdetail"); -// if (isdetail != null) { -// if (StringUtils.isBlank(isdetail.toString())||!"0".equals(isdetail.toString())){ -// continue; -// } -// }else{ -// continue; -// } -// Object oldvalue = map.get("oldvalue"); -// if (oldvalue != null) { -// if (StringUtils.isNotBlank(oldvalue.toString())) { -// oldCount++; -// } -// } -// -// Object newvalue = map.get("newvalue"); -// if (newvalue != null) { -// if (StringUtils.isNotBlank(newvalue.toString())) { -// newCount++; -// } -// } -// -// } -// } -// CaseInsensitiveMap jo = null; -// for(int i = 0 ; i < mainlist.size(); i++) { -// Map jomap = mainlist.get(i); -// jo = new CaseInsensitiveMap<>(jomap); -// String fieldName = jo.get("fielddesc"); -// String oldvalue = obj2String(jo.get("oldvalue")); -// String oldrealvalue = obj2String(jo.get("oldrealvalue")); -// String newValue = obj2String(jo.get("newvalue")); -// String newrealvalue = obj2String(jo.get("newrealvalue")); -// // oracle.sql.CLOB类型处理 -// jomap.put("oldvalue", oldvalue); -// jomap.put("oldrealvalue", oldrealvalue); -// jomap.put("newvalue", newValue); -// jomap.put("newrealvalue", newrealvalue); -// -// String fieldNameLabelId = jo.get("fieldnamelabelid"); -// if (StringUtils.isNotBlank(fieldNameLabelId)&&StringUtils.isNumeric(fieldNameLabelId)) { -// fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId),fieldName); -// } else if (StringUtils.isNotBlank(fieldNameLabelId)&&!StringUtils.isNumeric(fieldNameLabelId) && !"-1".equals(fieldNameLabelId)) { -// fieldName = fieldNameLabelId; -// } else if (StringUtils.isNotBlank(fieldName)&&StringUtils.isNumeric(fieldName)) { -// fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldName),fieldName); -// } -// if (StringUtils.isNotBlank(oldrealvalue)&&StringUtils.isNumeric(oldrealvalue)) { -// oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue),oldvalue); -// }else if (StringUtils.isNotBlank(oldrealvalue)&&!StringUtils.isNumeric(oldrealvalue)) { -// oldvalue = oldrealvalue; -// } -// if (StringUtils.isNotBlank(newrealvalue)&&StringUtils.isNumeric(newrealvalue)) { -// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue),newValue); -// }else if (StringUtils.isNotBlank(newrealvalue)&&!StringUtils.isNumeric(newrealvalue)) { -// newValue = newrealvalue; -// } -// -// //oldvalue,newValue 避免xss漏洞 分别进行转义 + for (Map map : list) { + Iterator> iterator = map.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry next = iterator.next(); + for (String recordColumn : recordColumns) { + if (next.getKey().equals(recordColumn) && next.getValue() instanceof String) { + map.put(next.getKey(), transfi18Method(next.getValue())); + } + } + } + map.put("modulenamespan", getModuleName(map.get("modulename"))); + //map.put("functionnamespan", getFunctionName(map.get("modulename"), map.get("functionname"))); + //switchDatabaseField(map); + } + + } + + public static void switchDatabaseField(Map map) { + map.put("date", map.get("log_date")); + map.put("operator", map.get("log_operator")); + map.put("result", map.get("log_result")); + } + + /** + * 转换数据成多语言 + * + * @param lists + */ + public static List transfLanguageData(List lists) { + if (lists != null && lists.size() > 0) { + for (Map map : lists) { + if (map != null) { + Iterator> iterator = map.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); + if (entry.getValue() instanceof Integer || entry.getValue() instanceof Long || entry.getValue() instanceof String) { + map.put(entry.getKey(), transfLanguageLableid(ElogSeviceUtils.getLongValue(entry.getValue().toString()), entry.getValue().toString())); + } else { + map.put(entry.getKey(), entry.getValue()); + } + } + } + } + } + return lists; + } + + public static String transfi18Method(String str) { + if ("新增".equals(str)) { + return transfLanguageLableid(63252l, str); + } else if ("查看".equals(str)) { + return transfLanguageLableid(55172l, str); + } else if ("修改".equals(str)) { + return transfLanguageLableid(63253l, str); + } else if ("更新".equals(str)) { + return transfLanguageLableid(29540l, str); + } else if ("删除".equals(str)) { + return transfLanguageLableid(63254l, str); + } else if (StringUtils.isNumeric(str) && str.length() < 10) { + return transfLanguageLableid(Long.parseLong(str), str); + } else { + return str; + } + } + + public static String transfLanguageLableid(Long lableid) { + return SalaryI18nUtil.getI18nLabel(Integer.parseInt(lableid.toString()), lableid.toString()); + } + + /** + * 转换多语言 + * + * @param lableid + * @param def + * @return + */ + public static String transfLanguageLableid(Long lableid, String def) { + return SalaryI18nUtil.getI18nLabel(Integer.parseInt(lableid.toString()), def); + } + + + /** + * 日志本地服务-更新明细转换 + * + * @param mainlist + * @param list + * @return + */ + public static Map switchChangeValue(List mainlist, List list) { + Map res = new HashMap<>(); + StringBuilder valuesChange = new StringBuilder(); + List valuesChanges = new ArrayList<>(); + String values = ""; + String operatetypeName = ""; + int oldCount = 0; + int newCount = 0; + String operatetype = ""; + CaseInsensitiveMap map = null; + if (list != null && list.size() > 0) { + for (Map hashmap : list) { + map = new CaseInsensitiveMap<>(hashmap); + Object obj = map.get("operatetype"); + if (obj != null) { + operatetype = obj.toString(); + } + } + } + if (mainlist != null && mainlist.size() > 0) { + for (Map hashMap : mainlist) { + map = new CaseInsensitiveMap<>(hashMap); + Object isdetail = map.get("isdetail"); + if (isdetail != null) { + if (StringUtils.isBlank(isdetail.toString()) || !"0".equals(isdetail.toString())) { + continue; + } + } else { + continue; + } + Object oldvalue = map.get("oldvalue"); + if (oldvalue != null) { + if (StringUtils.isNotBlank(oldvalue.toString())) { + oldCount++; + } + } + + Object newvalue = map.get("newvalue"); + if (newvalue != null) { + if (StringUtils.isNotBlank(newvalue.toString())) { + newCount++; + } + } + + } + } + CaseInsensitiveMap jo = null; + for (int i = 0; i < mainlist.size(); i++) { + Map jomap = mainlist.get(i); + jo = new CaseInsensitiveMap<>(jomap); + String fieldName = jo.get("fielddesc"); + String oldvalue = obj2String(jo.get("oldvalue")); + String oldrealvalue = obj2String(jo.get("oldrealvalue")); + String newValue = obj2String(jo.get("newvalue")); + String newrealvalue = obj2String(jo.get("newrealvalue")); + // oracle.sql.CLOB类型处理 + jomap.put("oldvalue", oldvalue); + jomap.put("oldrealvalue", oldrealvalue); + jomap.put("newvalue", newValue); + jomap.put("newrealvalue", newrealvalue); + + String fieldNameLabelId = jo.get("fieldnamelabelid"); + if (StringUtils.isNotBlank(fieldNameLabelId) && StringUtils.isNumeric(fieldNameLabelId)) { + fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId), fieldName); + } else if (StringUtils.isNotBlank(fieldNameLabelId) && !StringUtils.isNumeric(fieldNameLabelId) && !"-1".equals(fieldNameLabelId)) { + fieldName = fieldNameLabelId; + } else if (StringUtils.isNotBlank(fieldName) && StringUtils.isNumeric(fieldName)) { + fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldName), fieldName); + } + if (StringUtils.isNotBlank(oldrealvalue) && StringUtils.isNumeric(oldrealvalue)) { + oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue), oldvalue); + } else if (StringUtils.isNotBlank(oldrealvalue) && !StringUtils.isNumeric(oldrealvalue)) { + oldvalue = oldrealvalue; + } + if (StringUtils.isNotBlank(newrealvalue) && StringUtils.isNumeric(newrealvalue)) { + newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue), newValue); + } else if (StringUtils.isNotBlank(newrealvalue) && !StringUtils.isNumeric(newrealvalue)) { + newValue = newrealvalue; + } + + //oldvalue,newValue 避免xss漏洞 分别进行转义 // oldvalue = StringConversionForXSS(oldvalue); // newValue = StringConversionForXSS(newValue); -// -// if (oldCount != 0) { -// valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); -// -// } else if (oldCount == 0 || newCount==0 || operatetype.startsWith(OperateType.add)||operatetype.startsWith(OperateType.delete)) { -// valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); -// -// } else { -// valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); -// } -// //} -// /*if (valuesChange.length() > 3) { -// values = valuesChange.substring(0, valuesChange.length() - 3); -// }*/ -// } -// -// res.put("valueschanges", valuesChanges); -// res.put("detailcontexts", mainlist); -// return res; -// } -// -// private static String obj2String(Object o) { -// if (o == null) { -// return ""; -// } -// if (o instanceof String) { -// return (String) o; -// } -// return JSON.toJSONString(o); -// } -// -// /** -// * 服务中心结果集转换 -// */ -// public static void switchChangeValues(List list) { -// CaseInsensitiveMap map = null; -// for(Map hashMap : list) { -// map = new CaseInsensitiveMap<>(hashMap); -// int count = 0; -// StringBuilder valuesChange = new StringBuilder(); -// List valuesChanges = new ArrayList(); -// Object detailContexts = map.get("detailcontexts"); -// if(detailContexts != null) { -// JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); -// for(int i = 0 ; i < jsonArray.size(); i++) { -// JSONObject jo = jsonArray.getJSONObject(i); -// String isDetail = jo.getString("isDetail"); -// if (StringUtils.isBlank(isDetail)||!"0".equals(isDetail)){ -// continue; -// } -// String oldvalue = jo.getString("oldValue"); -// if (StringUtils.isNotBlank(oldvalue)) { -// count++; -// } -// } -// } -// -// if(detailContexts != null) { -// JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); -// for(int i = 0 ; i < jsonArray.size(); i++) { -// JSONObject jo = jsonArray.getJSONObject(i); -// String isDetail = jo.getString("isDetail"); -// if (StringUtils.isBlank(isDetail)||!"0".equals(isDetail)){ -// continue; -// } -// String fieldName = jo.getString("fieldDesc"); -// String oldvalue = jo.getString("oldValue"); -// String oldrealvalue = jo.getString("oldRealValue"); -// String newValue = jo.getString("newValue"); -// String newrealvalue = jo.getString("newRealValue"); -// String fieldNameLabelId = jo.getString("fieldNameLabelId"); -// if (StringUtils.isNotBlank(fieldNameLabelId)&&StringUtils.isNumeric(fieldNameLabelId)) { -// fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId)); -// } -// if (StringUtils.isNotBlank(oldrealvalue)&&StringUtils.isNumeric(oldrealvalue)) { -// oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue)); -// } -// if (StringUtils.isNotBlank(newrealvalue)&&StringUtils.isNumeric(newrealvalue)) { -// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue)); -// } -// if (count == 0) { -// valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); -// } else { -// valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); -// } -// -// } -// /*String values = ""; -// if (valuesChange.length() > 3) { -// values = valuesChange.substring(0, valuesChange.length() - 3); -// }*/ -// -// map.put("valueschanges", valuesChanges); -// } -// -// } -// } -// -// public static String valueChangeNewFormat(){ -// return "【%s】：%s"; -// } -// public static String valueChangeFormat(){ -// return "【%s】："+SystemEnv.getHtmlLabelName(61695,"由")+ -// "[%s] "+SystemEnv.getHtmlLabelName(61697,"改为")+" [%s]"; -// } -// -// public static void changKey2Lower(List list) { -// -// List newList = new ArrayList<>(); -// for(Map orgMap : list) { -// Map resultMap = new HashMap<>(); -// -// if (orgMap == null || orgMap.isEmpty()) { -// newList.add(resultMap); -// continue; -// } -// -// Set keySet = orgMap.keySet(); -// for (String key : keySet) { -// resultMap.put(key != null ? key.toLowerCase() : "", orgMap.get(key)); -// } -// newList.add(resultMap); -// } -// list.clear(); -// list.addAll(newList); -// } -// -// /** -// * 查看详细表的数据 -// * @param list -// */ -// public static Map switchDetailChangeValue(List list) { -// Map res = new HashMap<>(); -// List> lists = new ArrayList<>(); -// HashMap repeatTableName = new HashMap<>(); -// CaseInsensitiveMap map = null; -// for (Map hashMap : list) { -// map = new CaseInsensitiveMap<>(hashMap); -// List detailmap = new ArrayList<>(); -// HashMap detailoldMap= new HashMap<>(); -// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); -// detailoldMap.put("dataid",map.get("dataid")); -// HashMap detailnewMap= new HashMap<>(); -// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); -// detailnewMap.put("dataid",map.get("dataid")); -// detailmap.add(detailoldMap); -// detailmap.add(detailnewMap); -// WeaTable wea = new WeaTable(); -// wea.getColumns().add(new WeaTableColumn(SystemEnv.getHtmlLabelName(63250,"操作"), "operator", "5%")); + + if (oldCount != 0) { + valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); + + } else if (oldCount == 0 || newCount == 0 || operatetype.startsWith(OperateType.add) || operatetype.startsWith(OperateType.delete)) { + valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); + + } else { + valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); + } + //} + /*if (valuesChange.length() > 3) { + values = valuesChange.substring(0, valuesChange.length() - 3); + }*/ + } + + res.put("valueschanges", valuesChanges); + res.put("detailcontexts", mainlist); + return res; + } + + private static String obj2String(Object o) { + if (o == null) { + return ""; + } + if (o instanceof String) { + return (String) o; + } + return JSON.toJSONString(o); + } + + /** + * 服务中心结果集转换 + */ + public static void switchChangeValues(List list) { + CaseInsensitiveMap map = null; + for (Map hashMap : list) { + map = new CaseInsensitiveMap<>(hashMap); + int count = 0; + StringBuilder valuesChange = new StringBuilder(); + List valuesChanges = new ArrayList(); + Object detailContexts = map.get("detailcontexts"); + if (detailContexts != null) { + JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jo = jsonArray.getJSONObject(i); + String isDetail = jo.getString("isDetail"); + if (StringUtils.isBlank(isDetail) || !"0".equals(isDetail)) { + continue; + } + String oldvalue = jo.getString("oldValue"); + if (StringUtils.isNotBlank(oldvalue)) { + count++; + } + } + } + + if (detailContexts != null) { + JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jo = jsonArray.getJSONObject(i); + String isDetail = jo.getString("isDetail"); + if (StringUtils.isBlank(isDetail) || !"0".equals(isDetail)) { + continue; + } + String fieldName = jo.getString("fieldDesc"); + String oldvalue = jo.getString("oldValue"); + String oldrealvalue = jo.getString("oldRealValue"); + String newValue = jo.getString("newValue"); + String newrealvalue = jo.getString("newRealValue"); + String fieldNameLabelId = jo.getString("fieldNameLabelId"); + if (StringUtils.isNotBlank(fieldNameLabelId) && StringUtils.isNumeric(fieldNameLabelId)) { + fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId)); + } + if (StringUtils.isNotBlank(oldrealvalue) && StringUtils.isNumeric(oldrealvalue)) { + oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue)); + } + if (StringUtils.isNotBlank(newrealvalue) && StringUtils.isNumeric(newrealvalue)) { + newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue)); + } + if (count == 0) { + valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); + } else { + valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); + } + + } + /*String values = ""; + if (valuesChange.length() > 3) { + values = valuesChange.substring(0, valuesChange.length() - 3); + }*/ + + map.put("valueschanges", valuesChanges); + } + + } + } + + public static String valueChangeNewFormat() { + return "【%s】：%s"; + } + + public static String valueChangeFormat() { + return "【%s】：" + SalaryI18nUtil.getI18nLabel(61695, "由") + + "[%s] " + SalaryI18nUtil.getI18nLabel(61697, "改为") + " [%s]"; + } + + public static void changKey2Lower(List list) { + + List newList = new ArrayList<>(); + for (Map orgMap : list) { + Map resultMap = new HashMap<>(); + + if (orgMap == null || orgMap.isEmpty()) { + newList.add(resultMap); + continue; + } + + Set keySet = orgMap.keySet(); + for (String key : keySet) { + resultMap.put(key != null ? key.toLowerCase() : "", orgMap.get(key)); + } + newList.add(resultMap); + } + list.clear(); + list.addAll(newList); + } + + /** + * 查看详细表的数据 + * + * @param list + */ + public static Map switchDetailChangeValue(List list) { + Map res = new HashMap<>(); + List> lists = new ArrayList<>(); + HashMap repeatTableName = new HashMap<>(); + CaseInsensitiveMap map = null; + for (Map hashMap : list) { + map = new CaseInsensitiveMap<>(hashMap); + List detailmap = new ArrayList<>(); + HashMap detailoldMap = new HashMap<>(); + detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); + detailoldMap.put("dataid", map.get("dataid")); + HashMap detailnewMap = new HashMap<>(); + detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); + detailnewMap.put("dataid", map.get("dataid")); + detailmap.add(detailoldMap); + detailmap.add(detailnewMap); + WeaTable wea = new WeaTable(); + wea.getColumns().add(new WeaTableColumn("5%",SalaryI18nUtil.getI18nLabel(63250, "操作"), "operator")); // wea.getColumns().add(new WeaTableColumn("dataid", "dataid", true)); -// Object tablename = map.get("tablename"); -// Object tablenamelabelid = map.get("tablenamelabelid"); -// if (tablenamelabelid != null) { -// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { -// tablename = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); -// } -// } -// Map m = new HashMap<>(); -// if (tablename!=null&&StringUtils.isNotBlank(tablename.toString())) { -// String temptablename = repeatTableName.get(tablename.toString()); -// if (tablename.toString().equals(temptablename)) { -// continue; -// } -// repeatTableName.put(tablename.toString(), tablename.toString()); -// m.put("tablename", tablename.toString()); -// m.put("detailmap", detailmap); -// m.put("column", wea); -// lists.add(m); -// } else { -// tablename = tablename!=null?tablename:""; -// String temptablename = repeatTableName.get(tablename.toString()); -// if (tablename.toString().equals(temptablename)) { -// continue; -// } -// repeatTableName.put(tablename.toString(), tablename.toString()); -// m.put("tablename", ""); -// m.put("detailmap", detailmap); -// m.put("column", wea); -// lists.add(m); -// } -// } -// -// for (Map hashMap : list) { -// map = new CaseInsensitiveMap<>(hashMap); -// Object isDetail = map.get("isdetail"); -// if (isDetail != null) { -// if ("0".equals(isDetail.toString())) { -// continue; -// } -// } else { -// continue; -// } -// String title = ""; -// String dataIndex = ""; -// String oldValue = ""; -// String newValue = ""; -// String tableName = ""; -// String dataId = ""; -// -// Object fieldDesc = map.get("fielddesc"); -// if (fieldDesc != null) { -// if (StringUtils.isNotBlank(fieldDesc.toString())) { -// title = fieldDesc.toString(); -// } -// } -// -// Object fieldnamelabelid = map.get("fieldnamelabelid"); -// if (fieldnamelabelid != null) { -// if (StringUtils.isNotBlank(fieldnamelabelid.toString())&&StringUtils.isNumeric(fieldnamelabelid.toString())) { -// title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); -// } -// } -// -// Object fieldName = map.get("fieldname"); -// if (fieldName != null) { -// if (StringUtils.isNotBlank(fieldName.toString())) { -// dataIndex = fieldName.toString(); -// } -// } -// Object oValue = map.get("oldvalue"); -// if (oValue != null) { -// if (StringUtils.isNotBlank(oValue.toString())) { -// oldValue = oValue.toString(); -// } -// } -// Object nValue = map.get("newvalue"); -// if (nValue != null) { -// if (StringUtils.isNotBlank(nValue.toString())) { -// newValue = nValue.toString(); -// } -// } -// Object oldRealValue = map.get("oldrealvalue"); -// if (oldRealValue != null) { -// if (StringUtils.isNotBlank(oldRealValue.toString())&&StringUtils.isNumeric(oldRealValue.toString())) { -// oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); -// } -// } -// -// Object newrealvalue = map.get("newrealvalue"); -// if (newrealvalue != null) { -// if (StringUtils.isNotBlank(newrealvalue.toString())&&StringUtils.isNumeric(newrealvalue.toString())) { -// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); -// } -// } -// -// Object tablename = map.get("tablename"); -// if (StringUtils.isNotBlank(tablename.toString())) { -// tableName = tablename.toString(); -// } else { -// tableName = ""; -// } -// Object tablenamelabelid = map.get("tablenamelabelid"); -// if (tablenamelabelid != null) { -// if (tablenamelabelid != null) { -// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { -// tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); -// } -// } -// } -// Object dataid = map.get("dataid"); -// if (StringUtils.isNotBlank(dataid.toString())) { -// dataId = dataid.toString(); -// } else { -// dataId = ""; -// } -// for (Map m : lists) { -// Object o = m.get("tablename"); -// if (o != null) { -// if (tableName.equals(o)) { -// List details = (List) m.get("detailmap"); -// List newDetails = new ArrayList<>(); -// if (details != null && details.size() > 0) { -// for (Map detail : details) { -// Object data_id = detail.get("dataid"); -// if (data_id != null) { -// if (dataId.equals(data_id)) { -// Object operator = detail.get("operator"); -// if (operator != null) { -// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { -// detail.put(dataIndex, oldValue); -// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { -// detail.put(dataIndex, newValue); -// } -// } -// }else{ -// if (newDetails.size() > 2) { -// for (Map newDetail : newDetails) { -// if (dataId.equals(newDetail.get("dataid"))) { -// Object operator = detail.get("operator"); -// if (operator != null) { -// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { -// detail.put(dataIndex, oldValue); -// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { -// detail.put(dataIndex, newValue); -// } -// } -// }else{ -// HashMap detailoldMap= new HashMap<>(); -// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); -// detailoldMap.put("dataid",map.get("dataid")); -// detailoldMap.put(dataIndex, oldValue); -// HashMap detailnewMap= new HashMap<>(); -// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); -// detailnewMap.put("dataid",map.get("dataid")); -// detailnewMap.put(dataIndex, newValue); -// newDetails.add(detailoldMap); -// newDetails.add(detailnewMap); -// } -// } -// }else if (newDetails.size() == 0) { -// int count = 0; -// for (Map mapdetail : details) { -// Object dataid_ = mapdetail.get("dataid"); -// if (dataid_ != null && dataid_.equals(dataId)) { -// count++; -// } -// } -// if (count == 0) { -// HashMap detailoldMap= new HashMap<>(); -// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); -// detailoldMap.put("dataid",map.get("dataid")); -// detailoldMap.put(dataIndex, oldValue); -// HashMap detailnewMap= new HashMap<>(); -// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); -// detailnewMap.put("dataid",map.get("dataid")); -// detailnewMap.put(dataIndex, newValue); -// newDetails.add(detailoldMap); -// newDetails.add(detailnewMap); -// } -// } -// } -// } -// } -// } -// if (newDetails.size() > 0) { -// details.addAll(newDetails); -// newDetails.clear(); -// } -// -// WeaTable column = (WeaTable) m.get("column"); -// if (column != null) { -// List columns = column.getColumns(); -// if (columns != null && columns.size() > 0) { -// Boolean flag = true; -// for (Object object : columns) { -// WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); -// if (weaTableColumn != null) { -// String title1 = weaTableColumn.getTitle(); -// if (title.equals(title1)) { -// flag = false; -// break; -// } -// } -// } -// if (flag) { -// column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); -// m.put("column", column); -// } -// } -// } -// } -// } -// } -// } -// res.put("detail", lists); -// return res; -// } -// -// -// public static void switchDetailChangeValues(List list) { -// for (Map map : list) { -// Map repeatTableName = new HashMap<>(); -// List detailContexts = (List) map.get("detailcontexts"); -// List lists = new ArrayList<>(); -// if (detailContexts != null) { -// for (Map detailContext : detailContexts) { -// List detailmap = new ArrayList<>(); -// HashMap detailoldMap = new HashMap<>(); -// detailoldMap.put("operator", SystemEnv.getHtmlLabelName(63248,"操作(旧)")); -// detailoldMap.put("dataid",detailContext.get("dataid")); -// HashMap detailnewMap = new HashMap<>(); -// detailnewMap.put("operator", SystemEnv.getHtmlLabelName(63249,"操作(新)")); -// detailnewMap.put("dataid",detailContext.get("dataid")); -// detailmap.add(detailoldMap); -// detailmap.add(detailnewMap); -// WeaTable wea = new WeaTable(); -// wea.getColumns().add(new WeaTableColumn(SystemEnv.getHtmlLabelName(63250,"操作"), "operator", "5%")); + Object tablename = map.get("tablename"); + Object tablenamelabelid = map.get("tablenamelabelid"); + if (tablenamelabelid != null) { + if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { + tablename = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); + } + } + Map m = new HashMap<>(); + if (tablename != null && StringUtils.isNotBlank(tablename.toString())) { + String temptablename = repeatTableName.get(tablename.toString()); + if (tablename.toString().equals(temptablename)) { + continue; + } + repeatTableName.put(tablename.toString(), tablename.toString()); + m.put("tablename", tablename.toString()); + m.put("detailmap", detailmap); + m.put("column", wea); + lists.add(m); + } else { + tablename = tablename != null ? tablename : ""; + String temptablename = repeatTableName.get(tablename.toString()); + if (tablename.toString().equals(temptablename)) { + continue; + } + repeatTableName.put(tablename.toString(), tablename.toString()); + m.put("tablename", ""); + m.put("detailmap", detailmap); + m.put("column", wea); + lists.add(m); + } + } + + for (Map hashMap : list) { + map = new CaseInsensitiveMap<>(hashMap); + Object isDetail = map.get("isdetail"); + if (isDetail != null) { + if ("0".equals(isDetail.toString())) { + continue; + } + } else { + continue; + } + String title = ""; + String dataIndex = ""; + String oldValue = ""; + String newValue = ""; + String tableName = ""; + String dataId = ""; + + Object fieldDesc = map.get("fielddesc"); + if (fieldDesc != null) { + if (StringUtils.isNotBlank(fieldDesc.toString())) { + title = fieldDesc.toString(); + } + } + + Object fieldnamelabelid = map.get("fieldnamelabelid"); + if (fieldnamelabelid != null) { + if (StringUtils.isNotBlank(fieldnamelabelid.toString()) && StringUtils.isNumeric(fieldnamelabelid.toString())) { + title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); + } + } + + Object fieldName = map.get("fieldname"); + if (fieldName != null) { + if (StringUtils.isNotBlank(fieldName.toString())) { + dataIndex = fieldName.toString(); + } + } + Object oValue = map.get("oldvalue"); + if (oValue != null) { + if (StringUtils.isNotBlank(oValue.toString())) { + oldValue = oValue.toString(); + } + } + Object nValue = map.get("newvalue"); + if (nValue != null) { + if (StringUtils.isNotBlank(nValue.toString())) { + newValue = nValue.toString(); + } + } + Object oldRealValue = map.get("oldrealvalue"); + if (oldRealValue != null) { + if (StringUtils.isNotBlank(oldRealValue.toString()) && StringUtils.isNumeric(oldRealValue.toString())) { + oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); + } + } + + Object newrealvalue = map.get("newrealvalue"); + if (newrealvalue != null) { + if (StringUtils.isNotBlank(newrealvalue.toString()) && StringUtils.isNumeric(newrealvalue.toString())) { + newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); + } + } + + Object tablename = map.get("tablename"); + if (StringUtils.isNotBlank(tablename.toString())) { + tableName = tablename.toString(); + } else { + tableName = ""; + } + Object tablenamelabelid = map.get("tablenamelabelid"); + if (tablenamelabelid != null) { + if (tablenamelabelid != null) { + if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { + tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); + } + } + } + Object dataid = map.get("dataid"); + if (StringUtils.isNotBlank(dataid.toString())) { + dataId = dataid.toString(); + } else { + dataId = ""; + } + for (Map m : lists) { + Object o = m.get("tablename"); + if (o != null) { + if (tableName.equals(o)) { + List details = (List) m.get("detailmap"); + List newDetails = new ArrayList<>(); + if (details != null && details.size() > 0) { + for (Map detail : details) { + Object data_id = detail.get("dataid"); + if (data_id != null) { + if (dataId.equals(data_id)) { + Object operator = detail.get("operator"); + if (operator != null) { + if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { + detail.put(dataIndex, oldValue); + } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { + detail.put(dataIndex, newValue); + } + } + } else { + if (newDetails.size() > 2) { + for (Map newDetail : newDetails) { + if (dataId.equals(newDetail.get("dataid"))) { + Object operator = detail.get("operator"); + if (operator != null) { + if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { + detail.put(dataIndex, oldValue); + } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { + detail.put(dataIndex, newValue); + } + } + } else { + HashMap detailoldMap = new HashMap<>(); + detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); + detailoldMap.put("dataid", map.get("dataid")); + detailoldMap.put(dataIndex, oldValue); + HashMap detailnewMap = new HashMap<>(); + detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); + detailnewMap.put("dataid", map.get("dataid")); + detailnewMap.put(dataIndex, newValue); + newDetails.add(detailoldMap); + newDetails.add(detailnewMap); + } + } + } else if (newDetails.size() == 0) { + int count = 0; + for (Map mapdetail : details) { + Object dataid_ = mapdetail.get("dataid"); + if (dataid_ != null && dataid_.equals(dataId)) { + count++; + } + } + if (count == 0) { + HashMap detailoldMap = new HashMap<>(); + detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); + detailoldMap.put("dataid", map.get("dataid")); + detailoldMap.put(dataIndex, oldValue); + HashMap detailnewMap = new HashMap<>(); + detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); + detailnewMap.put("dataid", map.get("dataid")); + detailnewMap.put(dataIndex, newValue); + newDetails.add(detailoldMap); + newDetails.add(detailnewMap); + } + } + } + } + } + } + if (newDetails.size() > 0) { + details.addAll(newDetails); + newDetails.clear(); + } + + WeaTable column = (WeaTable) m.get("column"); + if (column != null) { + List columns = column.getColumns(); + if (columns != null && columns.size() > 0) { + Boolean flag = true; + for (Object object : columns) { + WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); + if (weaTableColumn != null) { + String title1 = weaTableColumn.getText(); + if (title.equals(title1)) { + flag = false; + break; + } + } + } + if (flag) { + column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); + m.put("column", column); + } + } + } + } + } + } + } + res.put("detail", lists); + return res; + } + + + public static void switchDetailChangeValues(List list) { + for (Map map : list) { + Map repeatTableName = new HashMap<>(); + List detailContexts = (List) map.get("detailcontexts"); + List lists = new ArrayList<>(); + if (detailContexts != null) { + for (Map detailContext : detailContexts) { + List detailmap = new ArrayList<>(); + HashMap detailoldMap = new HashMap<>(); + detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); + detailoldMap.put("dataid", detailContext.get("dataid")); + HashMap detailnewMap = new HashMap<>(); + detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); + detailnewMap.put("dataid", detailContext.get("dataid")); + detailmap.add(detailoldMap); + detailmap.add(detailnewMap); + WeaTable wea = new WeaTable(); + wea.getColumns().add(new WeaTableColumn(SalaryI18nUtil.getI18nLabel(63250, "操作"), "operator", "5%")); // wea.getColumns().add(new WeaTableColumn("dataid", "dataid", true)); -// Object tableName = detailContext.get("tableName"); -// Object tablenamelabelid = detailContext.get("tableNameLabelId"); -// if (tablenamelabelid != null) { -// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { -// tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); -// } -// } -// Map m = new HashMap<>(); -// if (StringUtils.isNotBlank(tableName.toString())) { -// String temptablename = repeatTableName.get(tableName.toString()); -// if (tableName.toString().equals(temptablename)) { -// continue; -// } -// repeatTableName.put(tableName.toString(), tableName.toString()); -// m.put("tablename", tableName.toString()); -// m.put("detailmap", detailmap); -// m.put("column", wea); -// lists.add(m); -// map.put("detail", lists); -// } else { -// String temptablename = repeatTableName.get(tableName.toString()); -// if (tableName.toString().equals(temptablename)) { -// continue; -// } -// repeatTableName.put(tableName.toString(), tableName.toString()); -// m.put("tablename", ""); -// m.put("detailmap", detailmap); -// m.put("column", wea); -// lists.add(m); -// map.put("detail", lists); -// } -// } -// } -// List details = (List) map.get("detail"); -// if (details != null) { -// int size = details.size(); -// int start = 0; -// while (start < size) { -// start++; -// -// for (int i = 0; i < size; i++) { -// Map detail = details.get(i); -// -// //for (Map detail : details) { -// if (details.size() > size) { -// break; -// } -// for (Map detailContext : detailContexts) { -// Object isDetail = detailContext.get("isDetail"); -// if (isDetail != null) { -// if ("0".equals(isDetail.toString())) { -// continue; -// } -// } else { -// continue; -// } -// String title = ""; -// String dataIndex = ""; -// String oldValue = ""; -// String newValue = ""; -// String tableName = ""; -// String dataId = ""; -// Object fieldDesc = detailContext.get("fieldDesc"); -// if (StringUtils.isNotBlank(fieldDesc.toString())) { -// title = fieldDesc.toString(); -// } -// Object fieldnamelabelid = detailContext.get("fieldNameLabelId"); -// if (fieldnamelabelid != null) { -// if (StringUtils.isNotBlank(fieldnamelabelid.toString())&&StringUtils.isNumeric(fieldnamelabelid.toString())) { -// title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); -// } -// } -// Object fieldName = detailContext.get("fieldName"); -// if (StringUtils.isNotBlank(fieldName.toString())) { -// dataIndex = fieldName.toString(); -// } -// Object oValue = detailContext.get("oldValue"); -// if (StringUtils.isNotBlank(oValue.toString())) { -// oldValue = oValue.toString(); -// } -// Object nValue = detailContext.get("newValue"); -// if (StringUtils.isNotBlank(nValue.toString())) { -// newValue = nValue.toString(); -// } -// Object oldRealValue = detailContext.get("oldRealValue"); -// if (oldRealValue != null) { -// if (StringUtils.isNotBlank(oldRealValue.toString())&&StringUtils.isNumeric(oldRealValue.toString())) { -// oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); -// } -// } -// -// Object newrealvalue = detailContext.get("newRealValue"); -// if (newrealvalue != null) { -// if (StringUtils.isNotBlank(newrealvalue.toString())&&StringUtils.isNumeric(newrealvalue.toString())) { -// newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); -// } -// } -// Object tablename = detailContext.get("tableName"); -// if (StringUtils.isNotBlank(tablename.toString())) { -// tableName = tablename.toString(); -// } else { -// tableName = ""; -// } -// Object tablenamelabelid = detailContext.get("tableNameLabelId"); -// if (tablenamelabelid != null) { -// if (tablenamelabelid != null) { -// if (StringUtils.isNotBlank(tablenamelabelid.toString())&&StringUtils.isNumeric(tablenamelabelid.toString())) { -// tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); -// } -// } -// } -// Object dataid = detailContext.get("dataid"); -// if (StringUtils.isNotBlank(dataid.toString())) { -// dataId = dataid.toString(); -// } else { -// dataId = ""; -// } -// Object detailtablename = detail.get("tablename"); -// if (detailtablename != null) { -// if (tableName.equals(detailtablename.toString())) { -// List detailmap = (List) detail.get("detailmap"); -// List newDetails = new ArrayList<>(); -// if (detailmap != null && detailmap.size() > 0) { -// for (Map d : detailmap) { -// Object data_id = d.get("dataid"); -// if (data_id != null) { -// if (dataId.equals(data_id)) { -// Object operator = d.get("operator"); -// if (operator != null) { -// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { -// d.put(dataIndex, oldValue); -// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { -// d.put(dataIndex, newValue); -// } -// } -// }else{ -// if (newDetails.size() > 2) { -// for (Map newDetail : newDetails) { -// if (dataId.equals(newDetail.get("dataid"))) { -// Object operator = d.get("operator"); -// if (operator != null) { -// if (SystemEnv.getHtmlLabelName(63248, "操作(旧)").equals(operator.toString())) { -// d.put(dataIndex, oldValue); -// } else if (SystemEnv.getHtmlLabelName(63249, "操作(新)").equals(operator.toString())) { -// d.put(dataIndex, newValue); -// } -// } -// }else{ -// HashMap detailoldMap= new HashMap<>(); -// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); -// detailoldMap.put("dataid",detailContext.get("dataid")); -// detailoldMap.put(dataIndex, oldValue); -// HashMap detailnewMap= new HashMap<>(); -// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); -// detailnewMap.put("dataid",detailContext.get("dataid")); -// detailnewMap.put(dataIndex, newValue); -// newDetails.add(detailoldMap); -// newDetails.add(detailnewMap); -// } -// } -// }else if (newDetails.size() == 0) { -// int count = 0; -// for (Map mapdetail : detailmap) { -// Object dataid_ = mapdetail.get("dataid"); -// if (dataid_ != null && dataid_.equals(dataId)) { -// count++; -// } -// } -// if (count == 0) { -// HashMap detailoldMap= new HashMap<>(); -// detailoldMap.put("operator",SystemEnv.getHtmlLabelName(63248,"操作(旧)")); -// detailoldMap.put("dataid",detailContext.get("dataid")); -// detailoldMap.put(dataIndex, oldValue); -// HashMap detailnewMap= new HashMap<>(); -// detailnewMap.put("operator",SystemEnv.getHtmlLabelName(63249,"操作(新)")); -// detailnewMap.put("dataid",detailContext.get("dataid")); -// detailnewMap.put(dataIndex, newValue); -// newDetails.add(detailoldMap); -// newDetails.add(detailnewMap); -// } -// } -// } -// } -// } -// } -// if (newDetails.size() > 0) { -// details.addAll(newDetails); -// newDetails.clear(); -// //detailmap = new ArrayList<>(); -// //detail.put("detailmap", detailmap); -// } -// -// WeaTable column = (WeaTable) detail.get("column"); -// if (column != null) { -// List columns = column.getColumns(); -// if (columns != null && columns.size() > 0) { -// Boolean flag = true; -// for (Object object : columns) { -// WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); -// if (weaTableColumn != null) { -// String title1 = weaTableColumn.getTitle(); -// if (title.equals(title1)) { -// flag = false; -// break; -// }else{ -// flag = true; -// } -// } -// } -// if (flag) { -// column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); -// detail.put("column", column); -// } -// } -// } -// } -// } -// } -// } -// } -// } -// } -// } -// -// public static List getSwitchDatabaseData(List list) { -// if (ElogConsts.ORACLE.equalsIgnoreCase(DatabaseUtil.getDatabaseId()) || ElogConsts.SQLSERVER.equalsIgnoreCase(DatabaseUtil.getDatabaseId())) { -// List arrayList = new ArrayList<>(); -// for (Map map : list) { -// Set en = map.entrySet(); -// Map hashMap = new HashMap<>(); -// for (Map.Entry entry : en) { -// Object key = entry.getKey(); -// Object val = null; -// if ("PARAMS".equalsIgnoreCase(key.toString())||"CUSTOMINFO".equalsIgnoreCase(key.toString()) -// || entry.getValue() instanceof ClobProxyImpl || entry.getValue() instanceof Clob) { -// val = JSONObject.toJSON(entry.getValue()); -// }else{ -// val = entry.getValue(); -// } -// hashMap.put(key.toString().toLowerCase(),val ); -// } -// switchDatabaseField(hashMap); -// arrayList.add(hashMap); -// } -// return arrayList; -// }else{ -// for (Map map : list) { -// switchDatabaseField(map); -// } -// return list; -// } -// } -// -// public static List getSwitchDatabaseAnalysisData(List list,Map keys) { -// if (!ElogConsts.MYSQL.equalsIgnoreCase(DatabaseUtil.getDatabaseId())) { -// List arrayList = new ArrayList<>(); -// -// for (Map map : list) { -// Set en = map.entrySet(); -// Map hashMap = new HashMap<>(); -// for (Map.Entry entry : en) { -// Object key = entry.getKey(); -// Object val = entry.getValue(); -// if (key.toString().equalsIgnoreCase(keys.get(key.toString().toLowerCase()))){ -// key = keys.get(key.toString().toLowerCase()); -// }else { -// key = key.toString().toLowerCase(); -// } -// hashMap.put(key.toString(),val ); -// } -// arrayList.add(hashMap); -// } -// return arrayList; -// } -// return list; -// } -// -// /** -// * 获取多个模块名称 -// * @param modules -// * @return -// */ -// public static Map getModuleNames(List modules) { -// Map hashMap = new HashMap<>(); -// if (modules == null || modules.size() == 0) { -// return hashMap; -// } -// for (String module : modules) { -// String modulenum = ElogSeviceUtils.null2String(moduleMap.get(module), module); -// String modulename = ElogSeviceUtils.isLongValue(modulenum) ? SystemEnv.getHtmlLabelName(ElogSeviceUtils.getLongValue(modulenum), modulenum) : modulenum; -// hashMap.put(module, modulename); -// } -// return hashMap; -// -// } -// + Object tableName = detailContext.get("tableName"); + Object tablenamelabelid = detailContext.get("tableNameLabelId"); + if (tablenamelabelid != null) { + if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { + tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); + } + } + Map m = new HashMap<>(); + if (StringUtils.isNotBlank(tableName.toString())) { + String temptablename = repeatTableName.get(tableName.toString()); + if (tableName.toString().equals(temptablename)) { + continue; + } + repeatTableName.put(tableName.toString(), tableName.toString()); + m.put("tablename", tableName.toString()); + m.put("detailmap", detailmap); + m.put("column", wea); + lists.add(m); + map.put("detail", lists); + } else { + String temptablename = repeatTableName.get(tableName.toString()); + if (tableName.toString().equals(temptablename)) { + continue; + } + repeatTableName.put(tableName.toString(), tableName.toString()); + m.put("tablename", ""); + m.put("detailmap", detailmap); + m.put("column", wea); + lists.add(m); + map.put("detail", lists); + } + } + } + List details = (List) map.get("detail"); + if (details != null) { + int size = details.size(); + int start = 0; + while (start < size) { + start++; + + for (int i = 0; i < size; i++) { + Map detail = details.get(i); + + //for (Map detail : details) { + if (details.size() > size) { + break; + } + for (Map detailContext : detailContexts) { + Object isDetail = detailContext.get("isDetail"); + if (isDetail != null) { + if ("0".equals(isDetail.toString())) { + continue; + } + } else { + continue; + } + String title = ""; + String dataIndex = ""; + String oldValue = ""; + String newValue = ""; + String tableName = ""; + String dataId = ""; + Object fieldDesc = detailContext.get("fieldDesc"); + if (StringUtils.isNotBlank(fieldDesc.toString())) { + title = fieldDesc.toString(); + } + Object fieldnamelabelid = detailContext.get("fieldNameLabelId"); + if (fieldnamelabelid != null) { + if (StringUtils.isNotBlank(fieldnamelabelid.toString()) && StringUtils.isNumeric(fieldnamelabelid.toString())) { + title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); + } + } + Object fieldName = detailContext.get("fieldName"); + if (StringUtils.isNotBlank(fieldName.toString())) { + dataIndex = fieldName.toString(); + } + Object oValue = detailContext.get("oldValue"); + if (StringUtils.isNotBlank(oValue.toString())) { + oldValue = oValue.toString(); + } + Object nValue = detailContext.get("newValue"); + if (StringUtils.isNotBlank(nValue.toString())) { + newValue = nValue.toString(); + } + Object oldRealValue = detailContext.get("oldRealValue"); + if (oldRealValue != null) { + if (StringUtils.isNotBlank(oldRealValue.toString()) && StringUtils.isNumeric(oldRealValue.toString())) { + oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); + } + } + + Object newrealvalue = detailContext.get("newRealValue"); + if (newrealvalue != null) { + if (StringUtils.isNotBlank(newrealvalue.toString()) && StringUtils.isNumeric(newrealvalue.toString())) { + newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); + } + } + Object tablename = detailContext.get("tableName"); + if (StringUtils.isNotBlank(tablename.toString())) { + tableName = tablename.toString(); + } else { + tableName = ""; + } + Object tablenamelabelid = detailContext.get("tableNameLabelId"); + if (tablenamelabelid != null) { + if (tablenamelabelid != null) { + if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { + tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); + } + } + } + Object dataid = detailContext.get("dataid"); + if (StringUtils.isNotBlank(dataid.toString())) { + dataId = dataid.toString(); + } else { + dataId = ""; + } + Object detailtablename = detail.get("tablename"); + if (detailtablename != null) { + if (tableName.equals(detailtablename.toString())) { + List detailmap = (List) detail.get("detailmap"); + List newDetails = new ArrayList<>(); + if (detailmap != null && detailmap.size() > 0) { + for (Map d : detailmap) { + Object data_id = d.get("dataid"); + if (data_id != null) { + if (dataId.equals(data_id)) { + Object operator = d.get("operator"); + if (operator != null) { + if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { + d.put(dataIndex, oldValue); + } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { + d.put(dataIndex, newValue); + } + } + } else { + if (newDetails.size() > 2) { + for (Map newDetail : newDetails) { + if (dataId.equals(newDetail.get("dataid"))) { + Object operator = d.get("operator"); + if (operator != null) { + if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { + d.put(dataIndex, oldValue); + } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { + d.put(dataIndex, newValue); + } + } + } else { + HashMap detailoldMap = new HashMap<>(); + detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); + detailoldMap.put("dataid", detailContext.get("dataid")); + detailoldMap.put(dataIndex, oldValue); + HashMap detailnewMap = new HashMap<>(); + detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); + detailnewMap.put("dataid", detailContext.get("dataid")); + detailnewMap.put(dataIndex, newValue); + newDetails.add(detailoldMap); + newDetails.add(detailnewMap); + } + } + } else if (newDetails.size() == 0) { + int count = 0; + for (Map mapdetail : detailmap) { + Object dataid_ = mapdetail.get("dataid"); + if (dataid_ != null && dataid_.equals(dataId)) { + count++; + } + } + if (count == 0) { + HashMap detailoldMap = new HashMap<>(); + detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); + detailoldMap.put("dataid", detailContext.get("dataid")); + detailoldMap.put(dataIndex, oldValue); + HashMap detailnewMap = new HashMap<>(); + detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); + detailnewMap.put("dataid", detailContext.get("dataid")); + detailnewMap.put(dataIndex, newValue); + newDetails.add(detailoldMap); + newDetails.add(detailnewMap); + } + } + } + } + } + } + if (newDetails.size() > 0) { + details.addAll(newDetails); + newDetails.clear(); + //detailmap = new ArrayList<>(); + //detail.put("detailmap", detailmap); + } + + WeaTable column = (WeaTable) detail.get("column"); + if (column != null) { + List columns = column.getColumns(); + if (columns != null && columns.size() > 0) { + Boolean flag = true; + for (Object object : columns) { + WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); + if (weaTableColumn != null) { + String title1 = weaTableColumn.getText(); + if (title.equals(title1)) { + flag = false; + break; + } else { + flag = true; + } + } + } + if (flag) { + column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); + detail.put("column", column); + } + } + } + } + } + } + } + } + } + } + } + + public static List getSwitchDatabaseData(List list) { + String databaseId = new RecordSet().getDBType(); + if (ElogConsts.ORACLE.equalsIgnoreCase(databaseId) || ElogConsts.SQLSERVER.equalsIgnoreCase(databaseId)) { + List arrayList = new ArrayList<>(); + for (Map map : list) { + Set en = map.entrySet(); + Map hashMap = new HashMap<>(); + for (Map.Entry entry : en) { + Object key = entry.getKey(); + Object val = null; + if ("PARAMS".equalsIgnoreCase(key.toString()) || "CUSTOMINFO".equalsIgnoreCase(key.toString()) + || entry.getValue() instanceof ClobProxyImpl || entry.getValue() instanceof Clob) { + val = JSONObject.toJSON(entry.getValue()); + } else { + val = entry.getValue(); + } + hashMap.put(key.toString().toLowerCase(), val); + } + switchDatabaseField(hashMap); + arrayList.add(hashMap); + } + return arrayList; + } else { + for (Map map : list) { + switchDatabaseField(map); + } + return list; + } + } + + public static List getSwitchDatabaseAnalysisData(List list, Map keys) { + String databaseId = new RecordSet().getDBType(); + if (!ElogConsts.MYSQL.equalsIgnoreCase(databaseId)) { + List arrayList = new ArrayList<>(); + + for (Map map : list) { + Set en = map.entrySet(); + Map hashMap = new HashMap<>(); + for (Map.Entry entry : en) { + Object key = entry.getKey(); + Object val = entry.getValue(); + if (key.toString().equalsIgnoreCase(keys.get(key.toString().toLowerCase()))) { + key = keys.get(key.toString().toLowerCase()); + } else { + key = key.toString().toLowerCase(); + } + hashMap.put(key.toString(), val); + } + arrayList.add(hashMap); + } + return arrayList; + } + return list; + } + + /** + * 获取多个模块名称 + * + * @param modules + * @return + */ + public static Map getModuleNames(List modules) { + Map hashMap = new HashMap<>(); + if (modules == null || modules.size() == 0) { + return hashMap; + } + for (String module : modules) { + String modulenum = ElogSeviceUtils.null2String(moduleMap.get(module), module); + String modulename = ElogSeviceUtils.isLongValue(modulenum) ? SalaryI18nUtil.getI18nLabel(Integer.parseInt(modulenum), modulenum) : modulenum; + hashMap.put(module, modulename); + } + return hashMap; + + } + // private static String StringConversionForXSS(String str) { // if (StringUtils.isBlank(str)) // return str; @@ -1348,47 +1355,48 @@ // return SecurityUtil.encodeForHtml(str, true); // // } -// -// -// /** -// * 判断是否为json字符串 -// * -// * @param content -// * @return -// */ -// public static boolean isJSONString(String content) { -// if (StringUtils.isEmpty(content)) { -// return false; -// } -// if (!content.startsWith("{") || !content.endsWith("}")) { -// if (!content.startsWith("[") || !content.endsWith("]")) { -// return false; -// } -// } -// try { -// JSONObject.parse(content); -// return true; -// } catch (Exception e) { -// return false; -// } -// } -// public static List getNameModule(String module) { -// if(StringUtils.isBlank(module)){ -// return new ArrayList<>(); -// } -// Map> dataMap = new HashMap<>(); -// moduleMap.forEach( (k,v)->{ -// List list=new ArrayList<>(); -// Integer moduleCode = moduleMap.get(k); -// String htmlLabelName = SystemEnv.getHtmlLabelName(moduleCode.longValue(), ""); -// if(dataMap.containsKey(htmlLabelName)){ -// list= dataMap.get(htmlLabelName); -// list .add(k); -// }else { -// list.add(k); -// } -// dataMap.put(htmlLabelName,list); -// }); -// return Objects.isNull(dataMap.get(module))?Arrays.asList(module):dataMap.get(module); -// } -//} + + + /** + * 判断是否为json字符串 + * + * @param content + * @return + */ + public static boolean isJSONString(String content) { + if (StringUtils.isEmpty(content)) { + return false; + } + if (!content.startsWith("{") || !content.endsWith("}")) { + if (!content.startsWith("[") || !content.endsWith("]")) { + return false; + } + } + try { + JSONObject.parse(content); + return true; + } catch (Exception e) { + return false; + } + } + + public static List getNameModule(String module) { + if (StringUtils.isBlank(module)) { + return new ArrayList<>(); + } + Map> dataMap = new HashMap<>(); + moduleMap.forEach((k, v) -> { + List list = new ArrayList<>(); + Integer moduleCode = moduleMap.get(k); + String htmlLabelName = SalaryI18nUtil.getI18nLabel(moduleCode, ""); + if (dataMap.containsKey(htmlLabelName)) { + list = dataMap.get(htmlLabelName); + list.add(k); + } else { + list.add(k); + } + dataMap.put(htmlLabelName, list); + }); + return Objects.isNull(dataMap.get(module)) ? Arrays.asList(module) : dataMap.get(module); + } +} diff --git a/src/com/engine/salary/elog/util/ElogSeviceUtils.java b/src/com/engine/salary/elog/util/ElogSeviceUtils.java index 3ee65acaa..58ca9ec31 100644 --- a/src/com/engine/salary/elog/util/ElogSeviceUtils.java +++ b/src/com/engine/salary/elog/util/ElogSeviceUtils.java @@ -1,18 +1,11 @@ package com.engine.salary.elog.util; -import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.elog.enums.FromTerminalType; -import com.weaver.common.component.table.page.Page; -import com.weaver.common.security.util.SecurityUtil; -import com.weaver.framework.log4j2.constant.ApmConstant; -import com.weaver.framework.rpc.context.impl.TenantRpcContext; -import com.weaver.framework.web.constant.EteamsConstant; import org.apache.commons.lang3.StringUtils; -import org.apache.dubbo.rpc.RpcContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.io.ByteArrayInputStream; @@ -231,14 +224,14 @@ public class ElogSeviceUtils { - /** - * 获取request请求 - * - * @return - */ - public static HttpServletRequest getRequest() { - return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - } +// /** +// * 获取request请求 +// * +// * @return +// */ +// public static HttpServletRequest getRequest() { +// return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// } /** * 将对象转换程字符串 @@ -263,14 +256,14 @@ public class ElogSeviceUtils { } } - public static Page getPage() { - HttpServletRequest request = getRequest(); - String num = request.getParameter("pageNum"); - String size = request.getParameter("pageSize"); - - Page page = new Page(ElogSeviceUtils.getIntValue(num, 1), ElogSeviceUtils.getIntValue(size, 10)); - return page; - } +// public static Page getPage() { +// HttpServletRequest request = getRequest(); +// String num = request.getParameter("pageNum"); +// String size = request.getParameter("pageSize"); +// +// Page page = new Page(ElogSeviceUtils.getIntValue(num, 1), ElogSeviceUtils.getIntValue(size, 10)); +// return page; +// } // public static void main(String[] args) { // //System.out.println(getTableName("select", "from")); @@ -317,22 +310,10 @@ public class ElogSeviceUtils { } public static String getTenantKey() { - - String tenantKey = TenantRpcContext.getTenantKey(); - if (StringUtils.isNotBlank(tenantKey)) { - return tenantKey; - } - - return ""; + return SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; } public static String getEmployeeId() { - - String employeeId = TenantRpcContext.getEmployeeId(); - if (StringUtils.isNotBlank(employeeId)) { - return employeeId; - } - return ""; } @@ -358,37 +339,37 @@ public class ElogSeviceUtils { // return ""; // } - /** - * 获取rpc信息（客户端ip和来源设备） - * - * @param context - */ - public static void initRpcInfo(LoggerContext context) { - String device = ""; - String clientIp = ""; - String traceId = ""; - try { - device = RpcContext.getContext().getAttachment(EteamsConstant.DEVICE); - clientIp = RpcContext.getContext().getAttachment(EteamsConstant.CLIENT_IP); - traceId = RpcContext.getContext().getAttachment(ApmConstant.TRACE_ID); - logger.info("rpc调用获取到 device:{},clientIp:{},traceId:{}", device, clientIp, traceId); - } catch (Exception e) { - logger.error("Exception", e); - } - if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { - context.setDevice(device); - } - if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { - context.setFromTerminal(getFromTerminal(device)); - } - - if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { - context.setClientIp(clientIp); - } - if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { - context.setBelongMainId(traceId); - } - } +// /** +// * 获取rpc信息（客户端ip和来源设备） +// * +// * @param context +// */ +// public static void initRpcInfo(LoggerContext context) { +// String device = ""; +// String clientIp = ""; +// String traceId = ""; +// try { +// device = RpcContext.getContext().getAttachment(EteamsConstant.DEVICE); +// clientIp = RpcContext.getContext().getAttachment(EteamsConstant.CLIENT_IP); +// traceId = RpcContext.getContext().getAttachment(ApmConstant.TRACE_ID); +// logger.info("rpc调用获取到 device:{},clientIp:{},traceId:{}", device, clientIp, traceId); +// } catch (Exception e) { +// logger.error("Exception", e); +// } +// if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { +// context.setDevice(device); +// } +// if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { +// context.setFromTerminal(getFromTerminal(device)); +// } +// +// if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { +// context.setClientIp(clientIp); +// } +// if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { +// context.setBelongMainId(traceId); +// } +// } public static String getFromTerminal(String device) { String setFT = ""; @@ -477,7 +458,7 @@ public class ElogSeviceUtils { if (count > 2) { return filterVal; } - value = SecurityUtil.ecodeForSql(value); +// value = SecurityUtil.ecodeForSql(value); return value; } diff --git a/src/com/engine/salary/elog/util/ElogUtils.java b/src/com/engine/salary/elog/util/ElogUtils.java index 077593ee6..38edd827d 100644 --- a/src/com/engine/salary/elog/util/ElogUtils.java +++ b/src/com/engine/salary/elog/util/ElogUtils.java @@ -2,7 +2,7 @@ package com.engine.salary.elog.util; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.elog.enums.FromTerminalType; import com.engine.salary.elog.threadlocal.ElogThreadLocal; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/elog/util/FieldNameMap.java b/src/com/engine/salary/elog/util/FieldNameMap.java new file mode 100644 index 000000000..dcde0258c --- /dev/null +++ b/src/com/engine/salary/elog/util/FieldNameMap.java @@ -0,0 +1,94 @@ +package com.engine.salary.elog.util; + +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * @ClassName: FieldNameMap + * @Description TODO + * @Author tanghj + * @Date 2021/3/31 14:27 + */ +public class FieldNameMap { + + private static Map mainFieldNameMap = new HashMap<>(); + + private static Map detailFieldNameMap = new HashMap<>(); + + private static Map> mainCusFieldNameMap = new HashMap<>(); + + private static Map> detailCusFieldNameMap = new HashMap<>(); + + + public static void setMainFieldName(Map fieldNameMap) { + mainFieldNameMap.putAll(fieldNameMap); + } + + public static void setDetailFieldName(Map fieldNameMap) { + detailFieldNameMap.putAll(fieldNameMap); + } + + public static void setMainCusFieldName(String module, String function, Map fieldNameMap) { + mainCusFieldNameMap.put(getKey(module, function), fieldNameMap); + } + + public static void setDetailCusFieldName(String module, String function, Map fieldNameMap) { + detailCusFieldNameMap.put(getKey(module, function), fieldNameMap); + } + + + public static String getMainFieldNameMap(String module, String function, String key) { + + String str = key.toLowerCase(); + if(mainFieldNameMap.containsKey(str)) { + return StringUtils.isNotEmpty(mainFieldNameMap.get(str)) ? mainFieldNameMap.get(str) : key; + } else { + return getMainCusFieldNameMap(module, function,key); + } + } + + public static String getDetailFieldNameMap(String module, String function, String key) { + key = key.toLowerCase(); + if(detailFieldNameMap.containsKey(key)) { + return StringUtils.isNotEmpty(detailFieldNameMap.get(key)) ? detailFieldNameMap.get(key) : key; + } else { + return getDetailCusFieldNameMap(module, function, key); + } + } + + public static String getMainCusFieldNameMap(String module, String function, String key) { + + if(mainCusFieldNameMap.containsKey(getKey(module, function))) { + if(mainCusFieldNameMap.get(getKey(module, function)).containsKey(key)) { + return StringUtils.isNotEmpty(mainCusFieldNameMap.get(getKey(module, function)).get(key)) ? + mainCusFieldNameMap.get(getKey(module, function)).get(key) : + key; + } else { + return key; + } + } else { + return key; + } + } + + public static String getDetailCusFieldNameMap(String module, String function, String key) { + + if(detailCusFieldNameMap.containsKey(getKey(module, function))) { + if(detailCusFieldNameMap.get(getKey(module, function)).containsKey(key)) { + return StringUtils.isNotEmpty(detailCusFieldNameMap.get(getKey(module, function)).get(key)) ? + detailCusFieldNameMap.get(getKey(module, function)).get(key) : + key; + } else { + return key; + } + } else { + return key; + } + } + + private static String getKey(String module, String function) { + return module + "@" + function; + } +} diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java index f3fca954a..c457291df 100644 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -7,9 +7,9 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.elog.async.LoggerMessageListener; -import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.dto.LoggerDetailContext; -import com.engine.salary.elog.dto.TableChangeBean; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerDetailContext; +import com.engine.salary.elog.entity.dto.TableChangeBean; import dm.jdbc.util.IdGenerator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/com/engine/salary/elog/web/LoggerTableController.java b/src/com/engine/salary/elog/web/LoggerTableController.java index 279bffdfe..b2969f833 100644 --- a/src/com/engine/salary/elog/web/LoggerTableController.java +++ b/src/com/engine/salary/elog/web/LoggerTableController.java @@ -1,178 +1,187 @@ package com.engine.salary.elog.web; -import com.weaver.common.authority.annotation.WeaPermission; -import com.weaver.common.base.entity.result.WeaResult; -import com.weaver.common.batch.entity.BatchDocumentMessage; -import com.weaver.common.component.table.WeaTable; -import com.weaver.common.elog.service.ApplicationContextProvider; -import com.weaver.common.elog.service.ILoggerTableService; -import com.weaver.common.elog.service.impl.LoggerTableService; -import com.weaver.framework.spring.annotation.AopClass; -import io.swagger.annotations.Api; +import com.engine.common.util.ServiceUtil; +import com.engine.salary.elog.entity.param.ELogGetLogParam; +import com.engine.salary.elog.service.ILoggerTableService; +import com.engine.salary.elog.service.impl.LoggerTableService; +import com.engine.salary.util.ResponseResult; +import com.engine.salary.util.page.PageInfo; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestParam; +import io.swagger.v3.oas.annotations.parameters.RequestBody; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import java.util.List; import java.util.Map; public class LoggerTableController { - @Autowired - @Qualifier("loggerTableService") - private LoggerTableService loggerTableService; - - @ApiOperation("获取日志") - @RequestMapping(path = "getLogs", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult getLogs(@RequestBody(required = false) @ApiParam("数据") String data){ - - WeaTable weaTable = loggerTableService.queryLogs(data); - return WeaResult.success(weaTable); - } - - @ApiOperation("获取日志（卡片）") - @RequestMapping(path = "getCardLogs", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult>> carddatas(@RequestBody(required = false) @ApiParam("数据") String data){ - List> list = loggerTableService.queryCardLogList(data); - return WeaResult.success(list); - } - - @ApiOperation("获取单条操作记录的更新明细") - @RequestMapping(path = "getDetailChanges", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult>> getDetailChanges(@PathVariable("module") @ApiParam("服务（模块）名")String module, - @PathVariable("function") @ApiParam("方法名")String function, - @RequestParam("mainid") @ApiParam("主键id") String mainid, - @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod) { - return WeaResult.success(loggerTableService.getDetailChanges(module, function,mainid,detailTransMethod)); + private ILoggerTableService getLoggerTableService(User user) { + return ServiceUtil.getService(LoggerTableService.class, user); } /** - * 获取单条操作记录的更新明细(分页) - * @param module 服务（模块）名 - * @param function 方法名 - * @param mainid 主键id - * @param detailTransMethod 转换方法 - * @param current 页码 - * @param pageSize 每页条数 - * @return WeaTable + * 获取日志 + * + * @param request + * @param response + * @param data + * @return */ - @ApiOperation("获取单条操作记录的更新明细(分页)") - @RequestMapping(path = "getDetailChangePages", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult getDetailChangePages(@PathVariable("module") @ApiParam("服务（模块）名")String module, - @PathVariable("function") @ApiParam("方法名")String function, - @RequestParam("mainid") @ApiParam("主键id") String mainid, - @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod, - @RequestParam("page") @ApiParam("页码") String current, - @RequestParam("pageSize") @ApiParam("每页条数") String pageSize) { - return WeaResult.success(loggerTableService.getDetailChangePages(module, function,mainid,detailTransMethod,current,pageSize)); + @POST + @Path("/getLogs") + @Produces(MediaType.APPLICATION_JSON) + public String getLogs(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String data) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getLoggerTableService(user)::queryLogs, data); + } + + @ApiOperation("获取日志（卡片）") + @POST + @Path("/getCardLogs") + @Produces(MediaType.APPLICATION_JSON) + public String carddatas(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String data) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>>(user).run(getLoggerTableService(user)::queryCardLogList, data); + } +// +// @ApiOperation("获取单条操作记录的更新明细") +// @RequestMapping(path = "getDetailChanges", method = {RequestMethod.GET, RequestMethod.POST}) +// @WeaPermission(publicPermission = true) +// public WeaResult>> getDetailChanges(@PathVariable("module") @ApiParam("服务（模块）名") String module, +// @PathVariable("function") @ApiParam("方法名") String function, +// @RequestParam("mainid") @ApiParam("主键id") String mainid, +// @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod) { +// return WeaResult.success(getLoggerTableService(user).getDetailChanges(module, function, mainid, detailTransMethod)); +// } +// @ApiOperation("获取单条操作记录的更新明细") +// @POST +// @Path("/getDetailChanges") +// @Produces(MediaType.APPLICATION_JSON) +// public String getDetailChanges(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String data) { +// User user = HrmUserVarify.getUser(request, response); +// return new ResponseResult>>(user).run(getLoggerTableService(user)::getDetailChanges, data); +// } +// +// /** +// * 获取单条操作记录的更新明细(分页) +// * +// * @param module 服务（模块）名 +// * @param function 方法名 +// * @param mainid 主键id +// * @param detailTransMethod 转换方法 +// * @param current 页码 +// * @param pageSize 每页条数 +// * @return WeaTable +// */ +// @ApiOperation("获取单条操作记录的更新明细(分页)") +// @RequestMapping(path = "getDetailChangePages", method = {RequestMethod.GET, RequestMethod.POST}) +// @WeaPermission(publicPermission = true) +// public WeaResult getDetailChangePages(@PathVariable("module") @ApiParam("服务（模块）名") String module, +// @PathVariable("function") @ApiParam("方法名") String function, +// @RequestParam("mainid") @ApiParam("主键id") String mainid, +// @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod, +// @RequestParam("page") @ApiParam("页码") String current, +// @RequestParam("pageSize") @ApiParam("每页条数") String pageSize) { +// return WeaResult.success(getLoggerTableService(user).getDetailChangePages(module, function, mainid, detailTransMethod, current, pageSize)); +// } + + /** + * 获取日志列表 + * @param request + * @param response + * @param param + * @return + */ + @POST + @Path("/datas") + @Produces(MediaType.APPLICATION_JSON) + public String datas(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ELogGetLogParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getLoggerTableService(user)::queryLogList, param); } - @ApiOperation("获取日志列表") - @RequestMapping(path = "datas", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult>> datas(@PathVariable("module") @ApiParam("服务（模块）名")String module, - @PathVariable("function") @ApiParam("方法名")String function, - @Param("pageSize") @ApiParam("每页多少数据")String pageSize, - @Param("current") @ApiParam("当前页")String current, - @ApiParam("查询条件") String condition){ - - if("datasecurity".equals(module) && "auditLog".equals(function)) { - try { - ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); - if(tableService != null){ - List> list = tableService.queryLogList(module, function, current, pageSize, condition); - return WeaResult.success(list); - } - } catch ( Exception e) { - - } - } - List> list = loggerTableService.queryLogList(module, function, current, pageSize, condition); - return WeaResult.success(list); - } - - @ApiOperation("获取日志总数") - @RequestMapping(path = "counts", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult> counts(@PathVariable("module") @ApiParam("服务（模块）名") String module, - @PathVariable("function") @ApiParam("方法名")String function){ - return WeaResult.success(loggerTableService.countLog(module,function), "success"); - } - - @ApiOperation("获取明细日志列表") - @RequestMapping(path = "detaildatas", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult>> detaildatas(@PathVariable("module") @ApiParam("服务（模块）名")String module, - @PathVariable("function") @ApiParam("方法名")String function, - @Param("pageSize") @ApiParam("每页多少数据")String pageSize, - @Param("current") @ApiParam("当前页")String current, - @Param("mainId") @ApiParam("主表id") String mainId, - @ApiParam("查询条件") String condition){ - - if("datasecurity".equals(module) && "auditLog".equals(function)) { - try { - ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); - if(tableService != null){ - List> list = tableService.queryDetailLogList(module, function, current, pageSize, condition, mainId); - return WeaResult.success(list); - } - } catch ( Exception e) { - - } - } - List> list = loggerTableService.queryDetailLogList(module, function, current, pageSize, condition, mainId); - return WeaResult.success(list); - } - - @ApiOperation("获取日志总数") - @RequestMapping(path = "detailcounts", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult> detailcounts(@PathVariable("module") @ApiParam("服务（模块）名") String module, - @PathVariable("function") @ApiParam("方法名")String function, - @Param("mainId") @ApiParam("主表id") String mainId){ - return WeaResult.success(loggerTableService.countDestailLog(module,function, mainId), "success"); - } - - @ApiOperation("根据traceId获取链路列表") - @RequestMapping(path = "queryLogTraceInfo", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult queryLogTraceInfo(@PathVariable("module") @ApiParam("服务（模块）名") String module, - @PathVariable("function") @ApiParam("方法名")String function, - @Param("traceId") @ApiParam("traceId") String traceId, - @Param("currentPage") @ApiParam("currentPage") Integer currentPage, - @Param("pageSize") @ApiParam("pageSize") Integer pageSize, - @Param("traceTransMethod") @ApiParam("traceTransMethod") String traceTransMethod - ){ - - if("datasecurity".equals(module) && "auditLog".equals(function)) { - try { - ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); - if(tableService != null){ - return WeaResult.success(tableService.queryElogTraceInfo(traceId,module,function,currentPage,pageSize,traceTransMethod ), "success"); - } - } catch ( Exception e) { - - } - } - - return WeaResult.success(loggerTableService.queryElogTraceInfo(traceId,module,function,currentPage,pageSize,traceTransMethod ), "success"); - } - - @ApiOperation("日志下载") - @RequestMapping(path = "downloadLog", method = {RequestMethod.GET, RequestMethod.POST}) - @WeaPermission(publicPermission = true) - public WeaResult downloadLog(@RequestBody(required = false) @ApiParam("数据") String data){ - - BatchDocumentMessage message = loggerTableService.downloadLog(data); - return WeaResult.success(message); - } +// @ApiOperation("获取日志总数") +// @RequestMapping(path = "counts", method = {RequestMethod.GET, RequestMethod.POST}) +// @WeaPermission(publicPermission = true) +// public WeaResult> counts(@PathVariable("module") @ApiParam("服务（模块）名") String module, +// @PathVariable("function") @ApiParam("方法名") String function) { +// return WeaResult.success(getLoggerTableService(user).countLog(module, function), "success"); +// } +// +// @ApiOperation("获取明细日志列表") +// @RequestMapping(path = "detaildatas", method = {RequestMethod.GET, RequestMethod.POST}) +// @WeaPermission(publicPermission = true) +// public WeaResult>> detaildatas(@PathVariable("module") @ApiParam("服务（模块）名") String module, +// @PathVariable("function") @ApiParam("方法名") String function, +// @Param("pageSize") @ApiParam("每页多少数据") String pageSize, +// @Param("current") @ApiParam("当前页") String current, +// @Param("mainId") @ApiParam("主表id") String mainId, +// @ApiParam("查询条件") String condition) { +// +// if ("datasecurity".equals(module) && "auditLog".equals(function)) { +// try { +// ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); +// if (tableService != null) { +// List> list = tableService.queryDetailLogList(module, function, current, pageSize, condition, mainId); +// return WeaResult.success(list); +// } +// } catch (Exception e) { +// +// } +// } +// List> list = getLoggerTableService(user).queryDetailLogList(module, function, current, pageSize, condition, mainId); +// return WeaResult.success(list); +// } +// +// @ApiOperation("获取日志总数") +// @RequestMapping(path = "detailcounts", method = {RequestMethod.GET, RequestMethod.POST}) +// @WeaPermission(publicPermission = true) +// public WeaResult> detailcounts(@PathVariable("module") @ApiParam("服务（模块）名") String module, +// @PathVariable("function") @ApiParam("方法名") String function, +// @Param("mainId") @ApiParam("主表id") String mainId) { +// return WeaResult.success(getLoggerTableService(user).countDestailLog(module, function, mainId), "success"); +// } +// +// @ApiOperation("根据traceId获取链路列表") +// @RequestMapping(path = "queryLogTraceInfo", method = {RequestMethod.GET, RequestMethod.POST}) +// @WeaPermission(publicPermission = true) +// public WeaResult queryLogTraceInfo(@PathVariable("module") @ApiParam("服务（模块）名") String module, +// @PathVariable("function") @ApiParam("方法名") String function, +// @Param("traceId") @ApiParam("traceId") String traceId, +// @Param("currentPage") @ApiParam("currentPage") Integer currentPage, +// @Param("pageSize") @ApiParam("pageSize") Integer pageSize, +// @Param("traceTransMethod") @ApiParam("traceTransMethod") String traceTransMethod +// ) { +// +// if ("datasecurity".equals(module) && "auditLog".equals(function)) { +// try { +// ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); +// if (tableService != null) { +// return WeaResult.success(tableService.queryElogTraceInfo(traceId, module, function, currentPage, pageSize, traceTransMethod), "success"); +// } +// } catch (Exception e) { +// +// } +// } +// +// return WeaResult.success(getLoggerTableService(user).queryElogTraceInfo(traceId, module, function, currentPage, pageSize, traceTransMethod), "success"); +// } +// +// @ApiOperation("日志下载") +// @RequestMapping(path = "downloadLog", method = {RequestMethod.GET, RequestMethod.POST}) +// @WeaPermission(publicPermission = true) +// public WeaResult downloadLog(@RequestBody(required = false) @ApiParam("数据") String data) { +// +// BatchDocumentMessage message = getLoggerTableService(user).downloadLog(data); +// return WeaResult.success(message); +// } } diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java index 5171e2641..c5547e753 100644 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java @@ -1,6 +1,6 @@ package com.engine.salary.mapper.elog; -import com.engine.salary.elog.dto.TableColumnBean; +import com.engine.salary.elog.entity.dto.TableColumnBean; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml index a0410827b..03e4028ea 100644 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml @@ -297,7 +297,7 @@ - SELECT COLUMN_NAME columnName, DATA_TYPE dataTypeStr, @@ -312,13 +312,13 @@ table_name = #{tableName} and TABLE_SCHEMA = (select database()) - select * from pg_tables where tableowner = (select current_user) and tablename = #{tableName} - SELECT COLUMN_NAME columnName FROM @@ -326,7 +326,7 @@ where TABLE_NAME=UPPER(#{tableName}) - SELECT COLUMN_NAME columnName FROM diff --git a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java index 6a969c83e..eda527efa 100644 --- a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java +++ b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java @@ -1,8 +1,8 @@ package com.engine.salary.mapper.elog; -import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.dto.LoggerDetailContext; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerDetailContext; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java index 56dddcd45..70807d832 100644 --- a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java +++ b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java @@ -1,7 +1,8 @@ package com.engine.salary.mapper.elog; -import com.engine.salary.elog.dto.LoggerContext; -import com.engine.salary.elog.dto.LoggerDetailContext; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.ReadInfoEntity; +import com.github.pagehelper.Page; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,22 +16,204 @@ import java.util.Map; */ public interface LocalElogDaoMapper { - int insertElogContext(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "params") String params, - @Param(value = "cusColumns") String cusColumns, - @Param(value = "cusValus") String cusValus, - @Param(value = "tableName") String tableName); - List> queryElogList(@Param(value = "logContent") LoggerContext loggerContext, - @Param("limit") String limit, - @Param(value = "tableName") String tableName); + List> queryCardElogList(@Param(value = "logContent") LoggerContext loggerContext, + @Param("limit") String limit, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql); + + List queryElogList(@Param(value = "page") Page page, + @Param(value = "logContent") LoggerContext loggerContext, + @Param("limit") String limit, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "columns") String columns); + + List queryElogListPapi(@Param(value = "page") Page page, + @Param(value = "logContent") LoggerContext loggerContext, + @Param("limit") String limit, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "columns") String columns); + + // @WeaDataPermission(mainDataTable = "#{mainDataTable}", +// permissionId = "#{permissionId}", +// permissionType = "#{permissionType}", +// mainDataTableAlias = "#{mainDataTableAlias}", +// primaryKey = "#{primaryKey}", +// permissionTargetId = "#{permissionTargetId}", +// permissionConfigSourceId = "#{permissionConfigSourceId}", +// permissionExcept = "true") + List queryElogList(@Param(value = "page") Page page, @Param(value = "logContent") LoggerContext loggerContext, + @Param("limit") String limit, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "mainDataTable") String mainDataTable, + @Param(value = "permissionId") String permissionId, + @Param(value = "permissionType") String permissionType, + @Param(value = "mainDataTableAlias") String mainDataTableAlias, + @Param(value = "primaryKey") String primaryKey, + @Param(value = "permissionTargetId") String permissionTargetId, + @Param(value = "permissionConfigSourceId") String permissionConfigSourceId, + @Param(value = "columns") String columns + ); + + // @WeaDataPermission(mainDataTable = "#{mainDataTable}", +// permissionId = "#{permissionId}", +// permissionType = "#{permissionType}", +// mainDataTableAlias = "#{mainDataTableAlias}", +// primaryKey = "#{primaryKey}", +// permissionExcept = "true") + List queryElogListPapi(@Param(value = "page") Page page, @Param(value = "logContent") LoggerContext loggerContext, + @Param("limit") String limit, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "mainDataTable") String mainDataTable, + @Param(value = "permissionId") String permissionId, + @Param(value = "permissionType") String permissionType, + @Param(value = "mainDataTableAlias") String mainDataTableAlias, + @Param(value = "primaryKey") String primaryKey, + @Param(value = "columns") String columns + ); + + List queryAllChanges(@Param(value = "tableName") String tableName, @Param("mainid") String mainid); Map elogCount(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName); + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql); - int insertElogDetail(@Param(value = "detailContext") LoggerDetailContext loggerDetailContext, - @Param(value = "mainid") String mainid, - @Param(value = "cusColumns") String cusColumns, - @Param(value = "cusValus") String cusValus, - @Param(value = "detailTableName") String tableName); + Map elogCountPapi(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql); + + + // @WeaDataPermission(mainDataTable = "#{mainDataTable}", +// permissionId = "#{permissionId}", +// permissionType = "#{permissionType}", +// mainDataTableAlias = "#{mainDataTableAlias}", +// primaryKey = "#{primaryKey}", +// permissionTargetId = "#{permissionTargetId}", +// permissionConfigSourceId = "#{permissionConfigSourceId}", +// permissionExcept = "true") + Map elogCountByMorePermission(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "mainDataTable") String mainDataTable, + @Param(value = "permissionId") String permissionId, + @Param(value = "permissionType") String permissionType, + @Param(value = "mainDataTableAlias") String mainDataTableAlias, + @Param(value = "primaryKey") String primaryKey, + @Param(value = "permissionTargetId") String permissionTargetId, + @Param(value = "permissionConfigSourceId") String permissionConfigSourceId); + + // @WeaDataPermission(mainDataTable = "#{mainDataTable}", +// permissionId = "#{permissionId}", +// permissionType = "#{permissionType}", +// mainDataTableAlias = "#{mainDataTableAlias}", +// primaryKey = "#{primaryKey}", +// permissionTargetId = "#{permissionTargetId}", +// permissionConfigSourceId = "#{permissionConfigSourceId}", +// permissionCount = "count(*)", +// permissionExcept = "true") + Long elogCountOnlyNum(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "mainDataTable") String mainDataTable, + @Param(value = "permissionId") String permissionId, + @Param(value = "permissionType") String permissionType, + @Param(value = "mainDataTableAlias") String mainDataTableAlias, + @Param(value = "primaryKey") String primaryKey, + @Param(value = "permissionTargetId") String permissionTargetId, + @Param(value = "permissionConfigSourceId") String permissionConfigSourceId); + + + // @WeaDataPermission(mainDataTable = "#{mainDataTable}", +// permissionId = "#{permissionId}", +// permissionType = "#{permissionType}", +// mainDataTableAlias = "#{mainDataTableAlias}", +// primaryKey = "#{primaryKey}", +// permissionExcept = "true") + Map elogCount(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "mainDataTable") String mainDataTable, + @Param(value = "permissionId") String permissionId, + @Param(value = "permissionType") String permissionType, + @Param(value = "mainDataTableAlias") String mainDataTableAlias, + @Param(value = "primaryKey") String primaryKey); + + // @WeaDataPermission(mainDataTable = "#{mainDataTable}", +// permissionId = "#{permissionId}", +// permissionType = "#{permissionType}", +// mainDataTableAlias = "#{mainDataTableAlias}", +// primaryKey = "#{primaryKey}", +// permissionExcept = "true") + Map elogCountPapi(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql, + @Param(value = "mainDataTable") String mainDataTable, + @Param(value = "permissionId") String permissionId, + @Param(value = "permissionType") String permissionType, + @Param(value = "mainDataTableAlias") String mainDataTableAlias, + @Param(value = "primaryKey") String primaryKey); + + + List queryDetailElogList(@Param(value = "logContent") LoggerContext loggerContext, + @Param("limit") String limit, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql); + + Map elogDetailCount(@Param(value = "logContent") LoggerContext loggerContext, + @Param(value = "tableName") String tableName, + @Param(value = "conditionSql") String conditionSql); + +// List queryOperators(@Param(value = "tableName") String tableName, +// @Param(value = "targetId") String targetId, +// @Param(value = "operateType") String operateType); + + List queryReadInfoOperators(@Param(value = "tableName") String tableName, + @Param(value = "targetId") String targetId, + @Param(value = "operateType") String operateType, + @Param(value = "flag") Boolean flag); + + List queryReadInfoDateOperators(@Param(value = "tableName") String tableName, + @Param(value = "targetId") String targetId, + @Param(value = "operateType") String operateType, + @Param(value = "flag") Boolean flag, + @Param(value = "startDate") String startDate, + @Param(value = "endDate") String endDate); + + List queryAllMainData(@Param(value = "tableName") String tableName, @Param("uuid") String uuid); + + List queryAllMainChanges(@Param(value = "tableName") String tableName, @Param("mainid") String mainid); + + List queryAllDetailChanges(@Param(value = "tableName") String tableName, @Param("mainid") String mainid); + + Integer queryElogContextById(@Param(value = "id") Long id, + @Param(value = "tableName") String tableName); + + List queryElogTraceInfo(@Param(value = "traceId") String traceId, + @Param(value = "tableName") String tableName, + @Param(value = "offset") Integer offset, + @Param(value = "pageSize") Integer pageSize); + + int queryElogTraceInfoCount(@Param(value = "traceId") String traceId, + @Param(value = "tableName") String tableName); + + List queryLogInfoByCustom(@Param(value = "tableName") String tableName, + @Param(value = "sql") String sql); + + List queryAllChangesData(@Param("tableName") String tableName, @Param("mainid") String mainid); + + List queryTenantKeyOperators(@Param(value = "tableName") String tableName, + @Param(value = "tenantKey") String tenantKey, + @Param(value = "targetId") String targetId, + @Param(value = "operateType") String operateType, + @Param(value = "flag") Boolean flag); + + List queryAllChangesDataPages(@Param("tableName") String tableName, + @Param("mainid") String mainid, + @Param(value = "page") Page page); + + Integer queryAllChangesPageCounts(@Param("tableName") String tableName, @Param("mainid") String mainid); } diff --git a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml index 7349e7026..93c233896 100644 --- a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml +++ b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml @@ -2,40 +2,411 @@ - - - insert into ${tableName} (uuid, date, tenant_key, modulename, functionName, - operator, operatorname, targetid, targetname, interfacename, operatetype, operatedesc, - params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice, cancelcontext, device, groupid - ${cusColumns}) - values - (#{logContent.uuid}, #{logContent.date}, - #{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName}, #{logContent.operator}, #{logContent.operatorName}, #{logContent.targetId} - , #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType}, #{logContent.operatedesc}, - #{params}, #{logContent.clientIp}, #{logContent.groupNameLabel}, #{logContent.redoService}, - #{logContent.redoContext}, #{logContent.cancelService}, #{logContent.cancelContext}, #{logContent.device}, #{logContent.groupId} - ${cusValus}) - - + + + + + + + + + + + + + + + + - - insert into ${detailTableName} (mainid, uuid, tablename, fieldname, newvalue, oldvalue, - fielddesc, showorder - ${cusColumns}) - values( - #{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, #{detailContext.fieldName}, #{detailContext.newValue}, - #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder} - ${cusValus} - ) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index a0da13747..56d4c84df 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -14,7 +14,6 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; import com.engine.salary.entity.salarysob.po.SalarySobPO; -import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salaryacct.SalaryAcctEmployeeMapper; @@ -288,7 +287,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct List salaryAcctEmployeePOS = listByParam(queryParam); Set keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId()); List resultList = Lists.newArrayList(); - if(CollectionUtils.isNotEmpty(keySet)){ + if (CollectionUtils.isNotEmpty(keySet)) { lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> { if (!keySet.contains(k)) { resultList.add(v); @@ -556,19 +555,22 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct SalaryAcctEmployeePO lambdaQueryChainWrapper = SalaryAcctEmployeePO.builder().build(); // 个税扣缴义务人 - Collection taxAgentList = getTaxAgentService(user).listAllTaxAgents((long) user.getUID()); - if (CollectionUtils.isNotEmpty(taxAgentList)) { - List taxAgentIds = taxAgentList.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); - // 有查询参数就取交集 - if (CollectionUtils.isNotEmpty(param.getTaxAgent())) { - List finalTaxAgentIds = taxAgentIds; - taxAgentIds = param.getTaxAgent().stream().filter(finalTaxAgentIds::contains).collect(Collectors.toList()); - lambdaQueryChainWrapper.setTaxAgentIds(CollectionUtils.isEmpty(taxAgentIds) ? Collections.singletonList(0L) : taxAgentIds); - } else { - lambdaQueryChainWrapper.setTaxAgentIds(taxAgentIds); - } - } else { - lambdaQueryChainWrapper.setTaxAgentIds(Collections.singletonList(0L)); +// Collection taxAgentList = getTaxAgentService(user).listAllTaxAgents((long) user.getUID()); +// if (CollectionUtils.isNotEmpty(taxAgentList)) { +// List taxAgentIds = taxAgentList.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); +// // 有查询参数就取交集 +// if (CollectionUtils.isNotEmpty(param.getTaxAgent())) { +// List finalTaxAgentIds = taxAgentIds; +// taxAgentIds = param.getTaxAgent().stream().filter(finalTaxAgentIds::contains).collect(Collectors.toList()); +// lambdaQueryChainWrapper.setTaxAgentIds(CollectionUtils.isEmpty(taxAgentIds) ? Collections.singletonList(0L) : taxAgentIds); +// } else { +// lambdaQueryChainWrapper.setTaxAgentIds(taxAgentIds); +// } +// } else { +// lambdaQueryChainWrapper.setTaxAgentIds(Collections.singletonList(0L)); +// } + if (CollectionUtils.isNotEmpty(param.getTaxAgent())) { + lambdaQueryChainWrapper.setTaxAgentIds(param.getTaxAgent()); } // 薪资所属月 diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 0110994fa..14bec72f5 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -6,7 +6,7 @@ import com.engine.core.impl.Service; import com.engine.salary.biz.SalaryItemBiz; import com.engine.salary.biz.SysSalaryItemBiz; import com.engine.salary.config.SalaryElogConfig; -import com.engine.salary.elog.dto.LoggerContext; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.entity.salaryformula.po.FormulaPO; import com.engine.salary.entity.salaryformula.po.FormulaVar; From 7d1ce983dd117ecd2a35e354b4f50f7dba3116de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 26 Dec 2023 17:49:50 +0800 Subject: [PATCH 028/169] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/elog/annotation/ElogTransform.java | 1 + .../entity/param/GetDetailChangesParam.java | 29 +++++++++++++++ .../elog/service/ILoggerTableService.java | 3 +- .../elog/service/impl/LoggerTableService.java | 7 ++-- .../elog/web/LoggerTableController.java | 37 +++++++++++++------ .../entity/salaryitem/po/SalaryItemPO.java | 22 +++++++++++ 6 files changed, 82 insertions(+), 17 deletions(-) create mode 100644 src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java diff --git a/src/com/engine/salary/elog/annotation/ElogTransform.java b/src/com/engine/salary/elog/annotation/ElogTransform.java index b876b18b2..120c41d8d 100644 --- a/src/com/engine/salary/elog/annotation/ElogTransform.java +++ b/src/com/engine/salary/elog/annotation/ElogTransform.java @@ -5,6 +5,7 @@ import java.lang.annotation.*; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE}) +@Inherited public @interface ElogTransform { String tablename() default ""; diff --git a/src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java b/src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java new file mode 100644 index 000000000..aec15823d --- /dev/null +++ b/src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java @@ -0,0 +1,29 @@ +package com.engine.salary.elog.entity.param; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class GetDetailChangesParam { + /** + * 服务（模块）名 + */ + String module; + /** + * 方法名 + */ + String function; + /** + * 主键id + */ + String mainid; + /** + * 转换方法 + */ + String detailTransMethod; +} diff --git a/src/com/engine/salary/elog/service/ILoggerTableService.java b/src/com/engine/salary/elog/service/ILoggerTableService.java index e59fde3fb..8657f0ea6 100644 --- a/src/com/engine/salary/elog/service/ILoggerTableService.java +++ b/src/com/engine/salary/elog/service/ILoggerTableService.java @@ -2,6 +2,7 @@ package com.engine.salary.elog.service; import com.cloudstore.eccom.pc.table.WeaTable; import com.engine.salary.elog.entity.param.ELogGetLogParam; +import com.engine.salary.elog.entity.param.GetDetailChangesParam; import com.engine.salary.util.page.PageInfo; import javax.servlet.http.HttpServletRequest; @@ -13,7 +14,7 @@ public interface ILoggerTableService { WeaTable queryLogsPapi(String data, HttpServletRequest request); - List getDetailChanges(String module, String function, String mainid,String transMethod); + List getDetailChanges(GetDetailChangesParam param); List getDetailChangesPapi(String module, String function, String mainid, String transMethod, HttpServletRequest request); diff --git a/src/com/engine/salary/elog/service/impl/LoggerTableService.java b/src/com/engine/salary/elog/service/impl/LoggerTableService.java index f81a8c0ab..217872e0c 100644 --- a/src/com/engine/salary/elog/service/impl/LoggerTableService.java +++ b/src/com/engine/salary/elog/service/impl/LoggerTableService.java @@ -14,6 +14,7 @@ import com.engine.salary.elog.entity.dto.FilterConditionDto; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.elog.entity.dto.ShowColumsDto; import com.engine.salary.elog.entity.param.ELogGetLogParam; +import com.engine.salary.elog.entity.param.GetDetailChangesParam; import com.engine.salary.elog.enums.ElogConsts; import com.engine.salary.elog.service.ILoggerTableService; import com.engine.salary.elog.util.ElogServiceUtils; @@ -851,10 +852,8 @@ public class LoggerTableService extends Service implements ILoggerTableService { } @Override - public List> getDetailChanges(String module, String function, String mainid, String detailTransMethod) { - List> list = getDetailChangesMethod(module, function, mainid, detailTransMethod, null); - return list; - + public List> getDetailChanges(GetDetailChangesParam param) { + return getDetailChangesMethod(param.getModule(), param.getFunction(), param.getMainid(), param.getDetailTransMethod(), null); } /** diff --git a/src/com/engine/salary/elog/web/LoggerTableController.java b/src/com/engine/salary/elog/web/LoggerTableController.java index b2969f833..fe85d3045 100644 --- a/src/com/engine/salary/elog/web/LoggerTableController.java +++ b/src/com/engine/salary/elog/web/LoggerTableController.java @@ -2,11 +2,11 @@ package com.engine.salary.elog.web; import com.engine.common.util.ServiceUtil; import com.engine.salary.elog.entity.param.ELogGetLogParam; +import com.engine.salary.elog.entity.param.GetDetailChangesParam; import com.engine.salary.elog.service.ILoggerTableService; import com.engine.salary.elog.service.impl.LoggerTableService; import com.engine.salary.util.ResponseResult; import com.engine.salary.util.page.PageInfo; -import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.parameters.RequestBody; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -43,7 +43,14 @@ public class LoggerTableController { return new ResponseResult(user).run(getLoggerTableService(user)::queryLogs, data); } - @ApiOperation("获取日志（卡片）") + /** + * 获取日志（卡片） + * + * @param request + * @param response + * @param data + * @return + */ @POST @Path("/getCardLogs") @Produces(MediaType.APPLICATION_JSON) @@ -51,16 +58,21 @@ public class LoggerTableController { User user = HrmUserVarify.getUser(request, response); return new ResponseResult>>(user).run(getLoggerTableService(user)::queryCardLogList, data); } -// -// @ApiOperation("获取单条操作记录的更新明细") -// @RequestMapping(path = "getDetailChanges", method = {RequestMethod.GET, RequestMethod.POST}) -// @WeaPermission(publicPermission = true) -// public WeaResult>> getDetailChanges(@PathVariable("module") @ApiParam("服务（模块）名") String module, -// @PathVariable("function") @ApiParam("方法名") String function, -// @RequestParam("mainid") @ApiParam("主键id") String mainid, -// @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod) { -// return WeaResult.success(getLoggerTableService(user).getDetailChanges(module, function, mainid, detailTransMethod)); -// } + + /** + * 获取单条操作记录的更新明细 + * @param request + * @param response + * @param param + * @return + */ + @POST + @Path("/getDetailChanges") + @Produces(MediaType.APPLICATION_JSON) + public String getDetailChanges(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GetDetailChangesParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getLoggerTableService(user)::getDetailChanges, param); + } // @ApiOperation("获取单条操作记录的更新明细") // @POST // @Path("/getDetailChanges") @@ -95,6 +107,7 @@ public class LoggerTableController { /** * 获取日志列表 + * * @param request * @param response * @param param diff --git a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java index 3115f0efa..1514cc3c5 100644 --- a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java +++ b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryitem.po; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.enums.SalaryRoundingModeEnum; import com.engine.salary.enums.SalarySystemTypeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; @@ -25,21 +26,25 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_salary_item +@ElogTransform(name = "薪资项目") public class SalaryItemPO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 名称 */ + @ElogTransform(name = "名称") private String name; /** * 编号 */ + @ElogTransform(name = "编号") private String code; /** @@ -47,26 +52,31 @@ public class SalaryItemPO { * * @see SalarySystemTypeEnum */ + @ElogTransform(name = "是否是系统项目") private Integer systemType; /** * 系统薪资项目的id（是从哪个系统薪资项目复制过来的） */ + @ElogTransform(name = "系统薪资项目的id") private Long sysSalaryItemId; /** * 默认使用。0：默认不适用、1：默认使用 */ + @ElogTransform(name = "默认使用") private Integer useDefault; /** * 薪资档案引用。0：薪资档案未引用、1：薪资档案引用 */ + @ElogTransform(name = "薪资档案引用") private Integer useInEmployeeSalary; /** * 核算时隐藏 */ + @ElogTransform(name = "核算时隐藏") private Integer hideDefault; /** @@ -74,11 +84,13 @@ public class SalaryItemPO { * * @see SalaryRoundingModeEnum */ + @ElogTransform(name = "进位规则") private Integer roundingMode; /** * 保留的小数位数 */ + @ElogTransform(name = "保留的小数位数") private Integer pattern; /** @@ -86,6 +98,7 @@ public class SalaryItemPO { * * @see SalaryValueTypeEnum */ + @ElogTransform(name = "取值方式") private Integer valueType; /** @@ -93,46 +106,55 @@ public class SalaryItemPO { * * @see SalaryDataTypeEnum */ + @ElogTransform(name = "字段类型") private String dataType; /** * 公式 */ + @ElogTransform(name = "公式") private Long formulaId; /** * 备注 */ + @ElogTransform(name = "备注") private String description; /** * 是否可以编辑。0：不可编辑、1：可编辑 */ + @ElogTransform(name = "是否可以编辑") private Integer canEdit; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; //查询条件 From ed29be3701259010cbf4eda11dc9076b5c3309fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 26 Dec 2023 18:47:45 +0800 Subject: [PATCH 029/169] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/elog/util/LoggerTemplate.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java index c457291df..8b5b6d377 100644 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -15,7 +15,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.dubbo.common.utils.AnnotationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import weaver.hrm.User; @@ -291,19 +290,12 @@ public class LoggerTemplate { if (changeBean.getNewValue() != null) { apiModel = changeBean.getNewValue().getClass().getAnnotation(ApiModel.class); tableTransform = changeBean.getNewValue().getClass().getAnnotation(ElogTransform.class); - //增加处理被动态代理对象注解的逻辑 - if (Objects.isNull(tableTransform)) { - tableTransform = AnnotationUtils.findAnnotation(changeBean.getNewValue().getClass(), ElogTransform.class); - } //fields = changeBean.getNewValue().getClass().getDeclaredFields(); fields = getAllFields(changeBean.getNewValue().getClass()); newJo = valueChange.getJSONObject("newValue"); } else { apiModel = changeBean.getOldValue().getClass().getAnnotation(ApiModel.class); tableTransform = changeBean.getOldValue().getClass().getAnnotation(ElogTransform.class); - if (Objects.isNull(tableTransform)) { - tableTransform = AnnotationUtils.findAnnotation(changeBean.getOldValue().getClass(), ElogTransform.class); - } //fields = changeBean.getOldValue().getClass().getDeclaredFields(); fields = getAllFields(changeBean.getOldValue().getClass()); } From e976c7aaec276a3df94b98327e3e62d62fda5095 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 27 Dec 2023 09:32:31 +0800 Subject: [PATCH 030/169] =?UTF-8?q?oracle=E5=B7=A5=E8=B5=84=E5=8D=95?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/mapper/salarybill/SalaryTemplateMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index a88ac1600..17e371c33 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -956,7 +956,7 @@ #{tenantKey}, - #{sms_setting}, + #{smsSetting}, From 2befcfd1f2585e6103152ac5c5495c845656b11e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 28 Dec 2023 11:08:53 +0800 Subject: [PATCH 031/169] =?UTF-8?q?pg=E8=84=9A=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/PG/sql202206090403.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resource/sqlupgrade/PG/sql202206090403.sql b/resource/sqlupgrade/PG/sql202206090403.sql index 679a8cc59..8f5d32f79 100644 --- a/resource/sqlupgrade/PG/sql202206090403.sql +++ b/resource/sqlupgrade/PG/sql202206090403.sql @@ -1,3 +1,3 @@ -ALTER TABLE hrsa_tax_declaration ADD COLUMN income_category int NOT NULL ; +ALTER TABLE hrsa_tax_declaration ADD COLUMN income_category int ; -ALTER TABLE hrsa_tax_declaration_detail ADD COLUMN employee_type int NOT NULL ; \ No newline at end of file +ALTER TABLE hrsa_tax_declaration_detail ADD COLUMN employee_type int ; \ No newline at end of file From 06fe3144ba995ac3b3d98792c0a27f28af2dae66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 28 Dec 2023 15:37:01 +0800 Subject: [PATCH 032/169] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/util/excel/DataTypeEnum.java | 32 +++++++++++++++++++ .../engine/salary/util/excel/ExcelHead.java | 28 ++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 src/com/engine/salary/util/excel/DataTypeEnum.java create mode 100644 src/com/engine/salary/util/excel/ExcelHead.java diff --git a/src/com/engine/salary/util/excel/DataTypeEnum.java b/src/com/engine/salary/util/excel/DataTypeEnum.java new file mode 100644 index 000000000..15e845cd9 --- /dev/null +++ b/src/com/engine/salary/util/excel/DataTypeEnum.java @@ -0,0 +1,32 @@ +package com.engine.salary.util.excel; + +import java.util.Arrays; +import java.util.Objects; + +public enum DataTypeEnum { + string("string", "字符类型"), + number("string", "数字类型"), + date("string", "日期类型"); + + private String value; + private String name; + + DataTypeEnum(String value, String name) { + this.value = value; + this.name = name; + } + + public String getValue() { + return value; + } + + public String getName() { + return name; + } + + + public static DataTypeEnum parseByValue(String value) { + return Arrays.stream(DataTypeEnum.values()).filter(typeEnum -> Objects.equals(typeEnum.getValue(), value)).findFirst().orElse(null); + } + +} diff --git a/src/com/engine/salary/util/excel/ExcelHead.java b/src/com/engine/salary/util/excel/ExcelHead.java new file mode 100644 index 000000000..cec7da51d --- /dev/null +++ b/src/com/engine/salary/util/excel/ExcelHead.java @@ -0,0 +1,28 @@ +package com.engine.salary.util.excel; + +import java.lang.annotation.*; + +/** + * 数据列表表头 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ExcelHead { + + String title() default ""; + + String dataIndex() default ""; + + DataTypeEnum dataType() default DataTypeEnum.string; + + int labelId() default -1; + + String width() default ""; + +} From 7e22711dcd684350c7006efbbc4ecbfa545ab9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 28 Dec 2023 15:47:05 +0800 Subject: [PATCH 033/169] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/TaxDeclarationAnnualListDTO.java | 11 +++++ .../dto/TaxDeclarationLaborListDTO.java | 40 +++++++++++++------ .../dto/TaxDeclarationWageListDTO.java | 26 ++++++++++++ .../impl/TaxDeclarationExcelServiceImpl.java | 28 ++----------- .../engine/salary/util/excel/ExcelUtil.java | 22 ++++++++++ 5 files changed, 89 insertions(+), 38 deletions(-) diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java index 75b1b3191..696a3f9f7 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationAnnualListDTO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.taxdeclaration.dto; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.TableTitle; +import com.engine.salary.util.excel.ExcelHead; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @@ -31,59 +32,69 @@ public class TaxDeclarationAnnualListDTO { text = "工号", width = "10%", column = "jobNum" ) @TableTitle(title ="工号",dataIndex = "jobNum",key = "jobNum") + @ExcelHead(title ="工号",dataIndex = "jobNum") private String jobNum; @SalaryTableColumn( text = "姓名", width = "10%", column = "username" ) @TableTitle(title ="姓名",dataIndex = "username",key = "username") + @ExcelHead(title ="姓名",dataIndex = "username") private String username; @SalaryTableColumn( text = "证件类型", width = "10%", column = "cardType" ) @TableTitle(title ="证件类型",dataIndex = "cardType",key = "cardType") + @ExcelHead(title ="证件类型",dataIndex = "cardType") private String cardType; @SalaryTableColumn( text = "证件号码", width = "10%", column = "cardNum" ) @TableTitle(title ="证件号码",dataIndex = "cardNum",key = "cardNum") + @ExcelHead(title ="证件号码",dataIndex = "cardNum") private String cardNum; @SalaryTableColumn( text = "全年一次性奖金额", width = "10%", column = "annualIncome" ) @TableTitle(title ="全年一次性奖金额",dataIndex = "annualIncome",key = "annualIncome") + @ExcelHead(title ="全年一次性奖金额",dataIndex = "annualIncome") private String annualIncome; @SalaryTableColumn( text = "免税收入", width = "10%", column = "annualTaxFreeIncome" ) @TableTitle(title ="免税收入",dataIndex = "annualTaxFreeIncome",key = "annualTaxFreeIncome") + @ExcelHead(title ="免税收入",dataIndex = "annualTaxFreeIncome") private String annualTaxFreeIncome; @SalaryTableColumn( text = "其他", width = "10%", column = "annualOther" ) @TableTitle(title ="其他",dataIndex = "annualOther",key = "annualOther") + @ExcelHead(title ="其他",dataIndex = "annualOther") private String annualOther; @SalaryTableColumn( text = "准予扣除的捐赠额", width = "10%", column = "annualDonateTax" ) @TableTitle(title ="准予扣除的捐赠额",dataIndex = "annualDonateTax",key = "annualDonateTax") + @ExcelHead(title ="准予扣除的捐赠额",dataIndex = "annualDonateTax") private String annualDonateTax; @SalaryTableColumn( text = "减免税额", width = "10%", column = "annualTaxSavings" ) @TableTitle(title ="减免税额",dataIndex = "annualTaxSavings",key = "annualTaxSavings") + @ExcelHead(title ="减免税额",dataIndex = "annualTaxSavings") private String annualTaxSavings; @SalaryTableColumn( text = "备注", width = "10%", column = "annualRemark" ) @TableTitle(title ="备注",dataIndex = "annualRemark",key = "annualRemark") + @ExcelHead(title ="备注",dataIndex = "annualRemark") private String annualRemark; } diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java index 73872aa0a..ce03fd52c 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationLaborListDTO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.taxdeclaration.dto; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.TableTitle; +import com.engine.salary.util.excel.ExcelHead; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @@ -30,78 +31,91 @@ public class TaxDeclarationLaborListDTO { @SalaryTableColumn( text = "工号", width = "10%", column = "jobNum" ) - @TableTitle(title ="工号",dataIndex = "jobNum",key = "jobNum") + @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") + @ExcelHead(title = "工号", dataIndex = "jobNum") private String jobNum; @SalaryTableColumn( text = "姓名", width = "10%", column = "username" ) - @TableTitle(title ="姓名",dataIndex = "username",key = "username") + @TableTitle(title = "姓名", dataIndex = "username", key = "username") + @ExcelHead(title = "姓名", dataIndex = "username") private String username; @SalaryTableColumn( text = "证件类型", width = "10%", column = "cardType" ) - @TableTitle(title ="证件类型",dataIndex = "cardType",key = "cardType") + @TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType") + @ExcelHead(title = "证件类型", dataIndex = "cardType") private String cardType; @SalaryTableColumn( text = "证件号码", width = "10%", column = "cardNum" ) - @TableTitle(title ="证件号码",dataIndex = "cardNum",key = "cardNum") + @TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum") + @ExcelHead(title = "证件号码", dataIndex = "cardNum") private String cardNum; @SalaryTableColumn( text = "所得项目", width = "10%", column = "incomeItems" ) - @TableTitle(title ="所得项目",dataIndex = "incomeItems",key = "incomeItems") + @TableTitle(title = "所得项目", dataIndex = "incomeItems", key = "incomeItems") + @ExcelHead(title = "所得项目", dataIndex = "incomeItems") private String incomeItems; @SalaryTableColumn( text = "劳务收入", width = "10%", column = "laborIncome" ) - @TableTitle(title ="劳务收入",dataIndex = "laborIncome",key = "laborIncome") + @TableTitle(title = "劳务收入", dataIndex = "laborIncome", key = "laborIncome") + @ExcelHead(title = "劳务收入", dataIndex = "laborIncome") private String laborIncome; @SalaryTableColumn( text = "劳务免税收入", width = "10%", column = "laborTaxFreeIncome" ) - @TableTitle(title ="劳务免税收入",dataIndex = "laborTaxFreeIncome",key = "laborTaxFreeIncome") + @TableTitle(title = "劳务免税收入", dataIndex = "laborTaxFreeIncome", key = "laborTaxFreeIncome") + @ExcelHead(title = "劳务免税收入", dataIndex = "laborTaxFreeIncome") private String laborTaxFreeIncome; @SalaryTableColumn( text = "商业健康保险", width = "10%", column = "commercialHealthInsurance" ) - @TableTitle(title ="商业健康保险",dataIndex = "commercialHealthInsurance",key = "commercialHealthInsurance") + @TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance") + @ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance") private String commercialHealthInsurance; @SalaryTableColumn( text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance" ) - @TableTitle(title ="税延养老保险",dataIndex = "taxDeferredEndowmentInsurance",key = "taxDeferredEndowmentInsurance") + @TableTitle(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance", key = "taxDeferredEndowmentInsurance") + @ExcelHead(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance") private String taxDeferredEndowmentInsurance; @SalaryTableColumn( text = "其他", width = "10%", column = "other" ) - @TableTitle(title ="其他",dataIndex = "other",key = "other") + @TableTitle(title = "其他", dataIndex = "other", key = "other") + @ExcelHead(title = "其他", dataIndex = "other") private String other; @SalaryTableColumn( text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation" ) - @TableTitle(title ="准予扣除的捐赠额",dataIndex = "allowedDonation",key = "allowedDonation") + @TableTitle(title = "准予扣除的捐赠额", dataIndex = "allowedDonation", key = "allowedDonation") + @ExcelHead(title = "准予扣除的捐赠额", dataIndex = "allowedDonation") private String allowedDonation; @SalaryTableColumn( text = "减免税额", width = "10%", column = "taxDeduction" ) - @TableTitle(title ="减免税额",dataIndex = "taxDeduction",key = "taxDeduction") + @TableTitle(title = "减免税额", dataIndex = "taxDeduction", key = "taxDeduction") + @ExcelHead(title = "减免税额", dataIndex = "taxDeduction") private String taxDeduction; @SalaryTableColumn( text = "备注", width = "10%", column = "description" ) - @TableTitle(title ="备注",dataIndex = "description",key = "description") + @TableTitle(title = "备注", dataIndex = "description", key = "description") + @ExcelHead(title = "备注", dataIndex = "description") private String description; } diff --git a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java index 3725aaf27..419f8f1e0 100644 --- a/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java +++ b/src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java @@ -4,6 +4,7 @@ import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.SalaryTable; import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.annotation.TableTitle; +import com.engine.salary.util.excel.ExcelHead; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -35,101 +36,126 @@ public class TaxDeclarationWageListDTO { @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum") @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum") + @ExcelHead(title = "工号", dataIndex = "jobNum") private String jobNum; @SalaryTableColumn(text = "姓名", width = "10%", column = "username") @TableTitle(title = "姓名", dataIndex = "username", key = "username") + @ExcelHead(title = "姓名", dataIndex = "username") private String username; @SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType") @TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType") + @ExcelHead(title = "证件类型", dataIndex = "cardType") private String cardType; @SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum") @TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum") + @ExcelHead(title = "证件号码", dataIndex = "cardNum") private String cardNum; @SalaryTableColumn(text = "本期收入", width = "10%", column = "income") @TableTitle(title = "本期收入", dataIndex = "income", key = "income") + @ExcelHead(title = "本期收入", dataIndex = "income") private String income; @SalaryTableColumn(text = "本期免税收入", width = "10%", column = "taxFreeIncome") @TableTitle(title = "本期免税收入", dataIndex = "taxFreeIncome", key = "taxFreeIncome") + @ExcelHead(title = "本期免税收入", dataIndex = "taxFreeIncome") private String taxFreeIncome; @SalaryTableColumn(text = "基本养老保险费", width = "10%", column = "endowmentInsurance") @TableTitle(title = "基本养老保险费", dataIndex = "endowmentInsurance", key = "endowmentInsurance") + @ExcelHead(title = "基本养老保险费", dataIndex = "endowmentInsurance") private String endowmentInsurance; @SalaryTableColumn(text = "基本医疗保险费", width = "10%", column = "medicalInsurance") @TableTitle(title = "基本医疗保险费", dataIndex = "medicalInsurance", key = "medicalInsurance") + @ExcelHead(title = "基本医疗保险费", dataIndex = "medicalInsurance") private String medicalInsurance; @SalaryTableColumn(text = "失业保险费", width = "10%", column = "unemploymentInsurance") @TableTitle(title = "失业保险费", dataIndex = "unemploymentInsurance", key = "unemploymentInsurance") + @ExcelHead(title = "失业保险费", dataIndex = "unemploymentInsurance") private String unemploymentInsurance; @SalaryTableColumn(text = "住房公积金", width = "10%", column = "housingProvidentFund") @TableTitle(title = "住房公积金", dataIndex = "housingProvidentFund", key = "housingProvidentFund") + @ExcelHead(title = "住房公积金", dataIndex = "housingProvidentFund") private String housingProvidentFund; @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation") @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation") + @ExcelHead(title = "累计子女教育", dataIndex = "addUpChildEducation") private String addUpChildEducation; @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest") @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest") + @ExcelHead(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest") private String addUpHousingLoanInterest; @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent") @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent") + @ExcelHead(title = "累计住房租金", dataIndex = "addUpHousingRent") private String addUpHousingRent; @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation") @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation") + @ExcelHead(title = "累计继续教育", dataIndex = "addUpContinuingEducation") private String addUpContinuingEducation; @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly") @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly") + @ExcelHead(title = "累计赡养老人", dataIndex = "addUpSupportElderly") private String addUpSupportElderly; @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical") @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical") + @ExcelHead(title = "累计大病医疗", dataIndex = "addUpIllnessMedical") private String addUpIllnessMedical; @SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare") @TableTitle(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare") + @ExcelHead(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare") private String addUpInfantCare; @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension") @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension") + @ExcelHead(title = "累计个人养老金", dataIndex = "addUpPrivatePension") private String addUpPrivatePension; @SalaryTableColumn(text = "企业（职业）年金", width = "10%", column = "annuity") @TableTitle(title = "企业（职业）年金", dataIndex = "annuity", key = "annuity") + @ExcelHead(title = "企业（职业）年金", dataIndex = "annuity") private String annuity; @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "commercialHealthInsurance") @TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance") + @ExcelHead(title = "商业健康保险", dataIndex = "commercialHealthInsurance") private String commercialHealthInsurance; @SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance") @TableTitle(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance", key = "taxDeferredEndowmentInsurance") + @ExcelHead(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance") private String taxDeferredEndowmentInsurance; @SalaryTableColumn(text = "其他", width = "10%", column = "other") @TableTitle(title = "其他", dataIndex = "other", key = "other") + @ExcelHead(title = "其他", dataIndex = "other") private String other; @SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation") @TableTitle(title = "准予扣除的捐赠额", dataIndex = "allowedDonation", key = "allowedDonation") + @ExcelHead(title = "准予扣除的捐赠额", dataIndex = "allowedDonation") private String allowedDonation; @SalaryTableColumn(text = "减免税额", width = "10%", column = "taxDeduction") @TableTitle(title = "减免税额", dataIndex = "taxDeduction", key = "taxDeduction") + @ExcelHead(title = "减免税额", dataIndex = "taxDeduction") private String taxDeduction; @SalaryTableColumn(text = "备注", width = "10%", column = "description") @TableTitle(title = "备注", dataIndex = "description", key = "description") + @ExcelHead(title = "备注", dataIndex = "description") private String description; } diff --git a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java index 957957790..c9eb8796a 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java @@ -2,7 +2,6 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationAnnualListDTO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationWageListDTO; @@ -23,7 +22,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.hrm.User; -import java.lang.reflect.Field; import java.util.List; import java.util.Map; import java.util.Objects; @@ -68,7 +66,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar List dataIndexList = Lists.newArrayList(); if (Objects.equals(taxDeclarationPO.getIncomeCategory(), IncomeCategoryEnum.WAGES_AND_SALARIES.getValue())) { // 解析表头 - parseHeader(TaxDeclarationWageListDTO.class, headerList, dataIndexList); + ExcelUtil.parseHeader(TaxDeclarationWageListDTO.class, headerList, dataIndexList); rows.add(headerList); for (int i = 0; i < totalPages; i++) { TaxDeclarationDetailListQueryParam queryParam = new TaxDeclarationDetailListQueryParam(); @@ -89,7 +87,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar } if (Objects.equals(taxDeclarationPO.getIncomeCategory(), IncomeCategoryEnum.REMUNERATION_FOR_LABOR.getValue())) { // 解析表头 - parseHeader(TaxDeclarationLaborListDTO.class, headerList, dataIndexList); + ExcelUtil.parseHeader(TaxDeclarationLaborListDTO.class, headerList, dataIndexList); rows.add(headerList); for (int i = 0; i < totalPages; i++) { TaxDeclarationDetailListQueryParam queryParam = new TaxDeclarationDetailListQueryParam(); @@ -111,7 +109,7 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar if (Objects.equals(taxDeclarationPO.getIncomeCategory(), IncomeCategoryEnum.ONETIME_ANNUAL_BONUS.getValue())) { // 解析表头 - parseHeader(TaxDeclarationAnnualListDTO.class, headerList, dataIndexList); + ExcelUtil.parseHeader(TaxDeclarationAnnualListDTO.class, headerList, dataIndexList); rows.add(headerList); for (int i = 0; i < totalPages; i++) { TaxDeclarationDetailListQueryParam queryParam = new TaxDeclarationDetailListQueryParam(); @@ -133,24 +131,4 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar return ExcelUtil.genWorkbookV2(rows, sheetName); } - - /** - * 解析表头 - * - * @param clazz - * @param headerList - * @param dataIndexList - * @param - */ - private void parseHeader(Class clazz, List headerList, List dataIndexList) { - Field[] declaredFields = clazz.getDeclaredFields(); - for (Field declaredField : declaredFields) { - if (!declaredField.isAnnotationPresent(SalaryTableColumn.class)) { - continue; - } - SalaryTableColumn annotation = declaredField.getAnnotation(SalaryTableColumn.class); - headerList.add(SalaryI18nUtil.getI18nLabel( annotation.labelId(), annotation.text())); - dataIndexList.add(declaredField.getName()); - } - } } diff --git a/src/com/engine/salary/util/excel/ExcelUtil.java b/src/com/engine/salary/util/excel/ExcelUtil.java index c50c11d2b..877714295 100644 --- a/src/com/engine/salary/util/excel/ExcelUtil.java +++ b/src/com/engine/salary/util/excel/ExcelUtil.java @@ -1,6 +1,7 @@ package com.engine.salary.util.excel; import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryI18nUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.FillPatternType; @@ -9,6 +10,7 @@ import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.xssf.usermodel.*; import java.awt.*; +import java.lang.reflect.Field; import java.util.Date; import java.util.List; @@ -267,4 +269,24 @@ public class ExcelUtil { } return workbook; } + + /** + * 解析表头 + * + * @param clazz + * @param headerList + * @param dataIndexList + * @param + */ + public static void parseHeader(Class clazz, List headerList, List dataIndexList) { + Field[] declaredFields = clazz.getDeclaredFields(); + for (Field declaredField : declaredFields) { + if (!declaredField.isAnnotationPresent(ExcelHead.class)) { + continue; + } + ExcelHead annotation = declaredField.getAnnotation(ExcelHead.class); + headerList.add(SalaryI18nUtil.getI18nLabel(annotation.labelId(), annotation.title())); + dataIndexList.add(declaredField.getName()); + } + } } From f03c0d0147749d0824466bd9caf884239463fc81 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 29 Dec 2023 10:27:35 +0800 Subject: [PATCH 034/169] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=87=B3=E8=B4=A6=E5=A5=97=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9A=84=E8=B4=A6=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SalaryItemServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 3c30540a4..b287d3792 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -421,6 +421,9 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService List salarySobItemList = getSalarySobItemService(user).listBySalaryItemIds(Collections.singleton(salaryItemId)); Set salarySobIds = SalaryEntityUtil.properties(salarySobItemList, SalarySobItemPO::getSalarySobId); List salarySobs = getSalarySobService(user).listByIds(salarySobIds); + // 获取能够管理的义务人 + Set taxAgentIds = SalaryEntityUtil.properties(getTaxAgentService(user).listAllTaxAgentsAsAdmin(Long.valueOf(user.getUID())), TaxAgentPO::getId); + salarySobs = salarySobs.stream().filter(sob -> taxAgentIds.contains(sob.getTaxAgentId())).collect(Collectors.toList()); return salarySobs.stream().map(m -> { Map map = new HashMap<>(); map.put("id", String.valueOf(m.getId())); From fe00f5c0e74247d579b3fb41b41ae46389d87339 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 2 Jan 2024 14:40:33 +0800 Subject: [PATCH 035/169] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E9=80=81action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/FileSalaryAcctRecordAction.java | 15 ++- .../salary/action/SendSalaryAction.java | 118 ++++++++++++++++++ .../salary/service/SalarySendService.java | 2 + .../service/impl/SalarySendServiceImpl.java | 5 + 4 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 src/com/engine/salary/action/SendSalaryAction.java diff --git a/src/com/engine/salary/action/FileSalaryAcctRecordAction.java b/src/com/engine/salary/action/FileSalaryAcctRecordAction.java index 7d6d22fb7..838c4c494 100644 --- a/src/com/engine/salary/action/FileSalaryAcctRecordAction.java +++ b/src/com/engine/salary/action/FileSalaryAcctRecordAction.java @@ -1,12 +1,14 @@ package com.engine.salary.action; import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.SalaryAcctRecordService; import com.engine.salary.service.impl.SalaryAcctRecordServiceImpl; import com.engine.salary.util.db.MapperProxyFactory; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; import weaver.interfaces.workflow.action.Action; @@ -59,8 +61,19 @@ public class FileSalaryAcctRecordAction implements Action { } User user = new User(); user.setUid(1); + Long acctRecordId = Long.valueOf(salaryAcctRecordId); + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(acctRecordId); + if (salaryAcctRecordPO == null) { + requestInfo.getRequestManager().setMessage("薪资核算记录不存在,或已被删除"); + return FAILURE_AND_CONTINUE; + } + if (salaryAcctRecordPO.getStatus() > 1) { + BaseBean baseBean = new BaseBean(); + baseBean.writeLog("核算记录归档action， 该核算记录已经归档：" + salaryAcctRecordPO.getId()); + return SUCCESS; + } try { - getSalaryAcctRecordService(user).file(Long.valueOf(salaryAcctRecordId)); + getSalaryAcctRecordService(user).file(acctRecordId); } catch (Exception e) { requestInfo.getRequestManager().setMessage(e.getMessage()); return FAILURE_AND_CONTINUE; diff --git a/src/com/engine/salary/action/SendSalaryAction.java b/src/com/engine/salary/action/SendSalaryAction.java new file mode 100644 index 000000000..f0f3ef154 --- /dev/null +++ b/src/com/engine/salary/action/SendSalaryAction.java @@ -0,0 +1,118 @@ +package com.engine.salary.action; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.biz.SalarySendInfoBiz; +import com.engine.salary.entity.salaryBill.param.SalarySendGrantParam; +import com.engine.salary.entity.salaryBill.po.SalarySendPO; +import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; +import com.engine.salary.service.SalaryAcctRecordService; +import com.engine.salary.service.SalaryBillService; +import com.engine.salary.service.SalarySendService; +import com.engine.salary.service.SalaryTemplateService; +import com.engine.salary.service.impl.SalaryAcctRecordServiceImpl; +import com.engine.salary.service.impl.SalaryBillServiceImpl; +import com.engine.salary.service.impl.SalarySendServiceImpl; +import com.engine.salary.service.impl.SalaryTemplateServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author Harryxzy + * @ClassName FileSalaryAcctRecordAction + * @date 2023/12/13 9:17 + * @description 工资单发放action + */ +@Slf4j +public class SendSalaryAction implements Action { + + + private SalaryAcctRecordService getSalaryAcctRecordService(User user) { + return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user); + } + + private SalarySendService getSalarySendService(User user) { + return ServiceUtil.getService(SalarySendServiceImpl.class, user); + } + + private SalaryTemplateService getSalaryTemplateService(User user) { + return ServiceUtil.getService(SalaryTemplateServiceImpl.class, user); + } + + private SalarySendInfoBiz salarySendInfoMapper = new SalarySendInfoBiz(); + + private SalaryBillService getSalaryBillService(User user) { + return ServiceUtil.getService(SalaryBillServiceImpl.class, user); + } + + + /** + * 发放id（核算记录id，工资单id）流程字段名 + */ + private String idFieldName; + + /** + * 根据什么id（核算记录id，工资单id）发工资单 + */ + private String sendBy; + + + @Override + public String execute(RequestInfo requestInfo) { + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + String idStr = fieldMap.get(idFieldName); + if (StringUtils.isBlank(idStr)) { + requestInfo.getRequestManager().setMessage("核算记录id或工资单id不能为空"); + return FAILURE_AND_CONTINUE; + } + User user = new User(); + user.setUid(1); + Long id = Long.valueOf(idStr); + SalarySendPO salarySendPO; + if(!org.h2.util.StringUtils.isNullOrEmpty(sendBy) && sendBy.equals("salaryAcctRecordId")) { + // 根据核算记录id发 + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(id); + if (salaryAcctRecordPO == null) { + requestInfo.getRequestManager().setMessage("薪资核算记录不存在,或已被删除"); + return FAILURE_AND_CONTINUE; + } + if (salaryAcctRecordPO.getStatus() == 1) { + requestInfo.getRequestManager().setMessage("核算记录还未归档,请先归档"); + return FAILURE_AND_CONTINUE; + } + // 获取工资单id + List salarySendPOList = getSalarySendService(user).listSome(SalarySendPO.builder().salaryAccountingId(id).sendStatus(0).build()); + salarySendPO = salarySendPOList.get(0); + } else if (!org.h2.util.StringUtils.isNullOrEmpty(sendBy) && sendBy.equals("salarySendId")) { + // 根据工资单发 + salarySendPO = getSalarySendService(user).getById(id); + } else { + requestInfo.getRequestManager().setMessage("请先维护根据什么id发放工资单的sendBy参数"); + return FAILURE_AND_CONTINUE; + } + + if (salarySendPO == null || salarySendPO.getId() == null) { + requestInfo.getRequestManager().setMessage("工资单不存在或已被删除！"); + return FAILURE_AND_CONTINUE; + } + try { + // 全部发放 + getSalaryBillService(user).grant(SalarySendGrantParam.builder().salarySendId(salarySendPO.getId()).build()); + } catch (Exception e) { + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } +} diff --git a/src/com/engine/salary/service/SalarySendService.java b/src/com/engine/salary/service/SalarySendService.java index 90da3440f..72fc71423 100644 --- a/src/com/engine/salary/service/SalarySendService.java +++ b/src/com/engine/salary/service/SalarySendService.java @@ -216,4 +216,6 @@ public interface SalarySendService { void autoConfirmSalaryBill(List needAutoIds); List getByIds(List salarySendId); + + List listSome(SalarySendPO param); } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 5c3a92f0d..20cb9f176 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -1725,4 +1725,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService } return getSalarySendMapper().getByIds(salarySendId); } + + @Override + public List listSome(SalarySendPO param) { + return getSalarySendMapper().listSome(param); + } } From 7945c84fbb5b4c2c47acd930a4e4afdb36bbb467 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 2 Jan 2024 16:37:07 +0800 Subject: [PATCH 036/169] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salaryacct/bo/SalaryAcctResultBO.java | 16 ++++++++-------- .../entity/salaryitem/bo/SalaryItemBO.java | 5 ++++- .../entity/salaryitem/dto/SalaryItemFormDTO.java | 3 +++ .../entity/salaryitem/dto/SalaryItemListDTO.java | 3 +++ .../salaryitem/param/SalaryItemSaveParam.java | 5 +++++ .../entity/salaryitem/po/SalaryItemPO.java | 5 +++++ .../salarysob/bo/SalarySobItemAggregateBO.java | 1 + .../entity/salarysob/dto/SalarySobItemDTO.java | 3 +++ .../mapper/salaryitem/SalaryItemMapper.xml | 12 +++++++++++- .../service/impl/SalaryItemServiceImpl.java | 1 + .../engine/salary/util/page/SalaryPageUtil.java | 5 ++++- 11 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 392ac81e6..0cd19d52b 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -170,7 +170,7 @@ public class SalaryAcctResultBO { List columns = Lists.newArrayList(); // 员工信息字段 for (SalarySobEmpFieldDTO salarySobEmpFieldDTO : salarySobItemAggregateDTO.getEmpFields()) { - columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobEmpFieldDTO.getFieldName()), salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId())); + columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobEmpFieldDTO.getFieldName(), 0), salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId())); } // 薪资项目分组下的薪资项目 for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) { @@ -180,29 +180,29 @@ public class SalaryAcctResultBO { List childrenColumns = Lists.newArrayList(); for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) { if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) { - childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); + childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); } else { - childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); + childrenColumns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); } } - WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemGroupDTO.getName()), salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns); + WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemGroupDTO.getName(), 0), salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()), childrenColumns); columns.add(weaTableColumnWapper); } // 没有分类的薪资项目 for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) { if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) { - columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); } else { - columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), salarySobItemDTO.getWidth()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); } } // 回算的薪资项目 for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getBackCalcItems()) { if (lockSalaryItemIds.contains(salarySobItemDTO.getSalaryItemId())) { - columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), 0), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.LOCK.getValue(), salarySobItemDTO.getPattern())); } else { - columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName()), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); + columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption(salarySobItemDTO.getName(), 0), salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId(), LockStatusEnum.UNLOCK.getValue(), salarySobItemDTO.getPattern())); } } diff --git a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java index f65c9f924..c11c58954 100644 --- a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java +++ b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java @@ -117,6 +117,7 @@ public class SalaryItemBO { .description(salaryItemPO.getDescription()) .canDelete(true) .canEdit(openFormulaForcedEditing ||Objects.equals(salaryItemPO.getCanEdit(), NumberUtils.INTEGER_ONE)) + .width(salaryItemPO.getWidth()) .build(); } ).collect(Collectors.toList()); @@ -200,7 +201,8 @@ public class SalaryItemBO { .setCanEdit(salaryItemPO.getCanEdit()) .setTaxAgentIds(salaryItemPO.getTaxAgentIds()) .setSharedType(salaryItemPO.getSharedType()) - .setSortedIndex(salaryItemPO.getSortedIndex()); + .setSortedIndex(salaryItemPO.getSortedIndex()) + .setWidth(salaryItemPO.getWidth()); } /** @@ -280,6 +282,7 @@ public class SalaryItemBO { .sharedType(Optional.ofNullable(saveParam.getSharedType()).orElse(0)) .taxAgentIds(saveParam.getTaxAgentIds()) .sortedIndex(saveParam.getSortedIndex()) + .width(saveParam.getWidth()) .build(); // 开启了"薪资档案引用"，取值方式固定为输入 // if (Objects.equals(saveParam.getUseInEmployeeSalary(), NumberUtils.INTEGER_ONE)) { diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java index 5101bf2e4..da0c6d4d5 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemFormDTO.java @@ -95,4 +95,7 @@ public class SalaryItemFormDTO { private String taxAgentIds; private Integer sortedIndex; + + // 宽度 + private Integer width; } diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java index adb0dc4b1..1e0af69d4 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java @@ -105,6 +105,9 @@ public class SalaryItemListDTO { @TableTitle(title = "显示顺序",dataIndex = "sortedIndex",key = "sortedIndex") private Integer sortedIndex; + // 宽度 + private Integer width; + @SalaryTableColumn(text = "操作", width = "20%", column = "operate") private String operate; } diff --git a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java index 916342dfd..a200cea77 100644 --- a/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java +++ b/src/com/engine/salary/entity/salaryitem/param/SalaryItemSaveParam.java @@ -102,4 +102,9 @@ public class SalaryItemSaveParam { * 排序 */ private Integer sortedIndex; + + /** + * 宽度 + */ + private Integer width; } diff --git a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java index 3115f0efa..3929bfed4 100644 --- a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java +++ b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java @@ -159,4 +159,9 @@ public class SalaryItemPO { * 排序 */ private Integer sortedIndex; + + /** + * 宽度 + */ + private Integer width; } diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java index be5bcf6c3..511e946c7 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java @@ -143,6 +143,7 @@ public class SalarySobItemAggregateBO { .sortedIndex(salarySobItemPO.getSortedIndex()) .canEdit(openFormulaForcedEditing || Objects.equals(salaryItemPO.getCanEdit(), 1)) .canDelete(openFormulaForcedEditing || salaryItemPO.getCanDelete() == null || Objects.equals(salaryItemPO.getCanDelete(), 1)) + .width(salaryItemPO.getWidth()) .build()); } } diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java index 81bbc138a..8b23d6446 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java @@ -109,4 +109,7 @@ public class SalarySobItemDTO { * 保留小数位数 */ private Integer pattern; + + // 显示宽度 + private Integer width; } diff --git a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml index 7dd705c72..93ec756ca 100644 --- a/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml +++ b/src/com/engine/salary/mapper/salaryitem/SalaryItemMapper.xml @@ -51,7 +51,8 @@ t.shared_type, t.tax_agent_ids, t.sorted_index, - t.hide_default + t.hide_default, + t.width @@ -217,6 +218,9 @@ sorted_index, + + width, + @@ -288,6 +292,9 @@ #{sortedIndex}, + + #{width}, + @@ -359,6 +366,9 @@ tax_agent_ids=#{taxAgentIds}, + + width=#{width}, + sorted_index=#{sortedIndex}, WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index b287d3792..a6afb5bd3 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -254,6 +254,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService newSalaryItemPO.setSharedType(saveParam.getSharedType()); newSalaryItemPO.setTaxAgentIds(saveParam.getTaxAgentIds()); newSalaryItemPO.setSortedIndex(saveParam.getSortedIndex()); + newSalaryItemPO.setWidth(saveParam.getWidth()); salaryItemBiz.updateById(newSalaryItemPO); //改名后更新公式 diff --git a/src/com/engine/salary/util/page/SalaryPageUtil.java b/src/com/engine/salary/util/page/SalaryPageUtil.java index 0e75d79d2..bc8892eee 100644 --- a/src/com/engine/salary/util/page/SalaryPageUtil.java +++ b/src/com/engine/salary/util/page/SalaryPageUtil.java @@ -91,7 +91,10 @@ public class SalaryPageUtil { endIndex > source.size() ? source.size() : endIndex); } - public static String selfAdaption(String chars) { + public static String selfAdaption(String chars, Integer width) { + if (width != null && width != 0){ + return width + ""; + } int adaption = 0; if (chars != null) { From 9ca420b5e6d6961a1dd7662331651e14e5101b6b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 4 Jan 2024 10:39:41 +0800 Subject: [PATCH 037/169] =?UTF-8?q?fix=E5=88=A0=E9=99=A4=E4=B9=89=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E6=97=B6=EF=BC=8C=E6=B2=A1=E5=88=86=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/TaxAgentEmpServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java index 7cd9cfd6f..f7fd19a94 100644 --- a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java @@ -53,7 +53,9 @@ public class TaxAgentEmpServiceImpl extends Service implements TaxAgentEmpServic return; } List idList = taxAgentEmpList.stream().map(TaxAgentEmpPO::getId).collect(Collectors.toList()); - getTaxAgentEmpMapper().deleteByIds(idList); + + List> partition = Lists.partition(idList, 500); + partition.forEach(getTaxAgentEmpMapper()::deleteByIds); } @Override From 681c0fb18eeaadc8d4d5345503db1fc3386976c9 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 8 Jan 2024 10:57:55 +0800 Subject: [PATCH 038/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AD=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=92=8C=E5=AD=90=E8=A1=A8=E7=9A=84=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index f2f3feee7..977adaab4 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -705,7 +705,7 @@ public class SIArchivesBiz { /** * @param paramReq - * @param employeeId + * @param */ public void otherSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { long employeeId = user.getUID(); @@ -781,8 +781,9 @@ public class SIArchivesBiz { if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { //对于非系统人员，编辑后状态切换为正在缴纳 baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - getInsuranceBaseInfoMapper().updateById(baseInfoPO); } + baseInfoPO.setOtherArchivesId(updateOtherInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); sqlSession.commit(); } else { otherSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesOtherSchemePO.builder() @@ -851,7 +852,7 @@ public class SIArchivesBiz { /** * @param paramReq - * @param employeeId + * @param */ public void fundSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { long employeeId = user.getUID(); @@ -927,8 +928,9 @@ public class SIArchivesBiz { if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { //对于非系统人员，编辑后状态切换为正在缴纳 baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - getInsuranceBaseInfoMapper().updateById(baseInfoPO); } + baseInfoPO.setFundArchivesId(updateFundInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); sqlSession.commit(); } else { fundSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesFundSchemePO.builder() @@ -1001,7 +1003,7 @@ public class SIArchivesBiz { /** * @param paramReq - * @param employeeId + * @param */ public void socialSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { long employeeId = user.getUID(); @@ -1084,8 +1086,9 @@ public class SIArchivesBiz { if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { //对于非系统人员，编辑后状态切换为正在缴纳 baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - getInsuranceBaseInfoMapper().updateById(baseInfoPO); } + baseInfoPO.setSocialArchivesId(updateSocialInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); sqlSession.commit(); } else { socialSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesSocialSchemePO.builder() From c0c93490fe58359c40d1bc04796efa4384fa9c1f Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 8 Jan 2024 15:32:49 +0800 Subject: [PATCH 039/169] sql --- resource/sqlupgrade/DM/sql202401080103.sql | 3 +++ resource/sqlupgrade/GS/sql202401080103.sql | 3 +++ resource/sqlupgrade/JC/sql202401080103.sql | 3 +++ resource/sqlupgrade/Mysql/sql202401080103.sql | 1 + resource/sqlupgrade/Oracle/sql202401080103.sql | 2 ++ resource/sqlupgrade/PG/sql202401080103.sql | 1 + resource/sqlupgrade/SQLServer/sql202401080103.sql | 2 ++ resource/sqlupgrade/ST/sql202401080103.sql | 3 +++ 8 files changed, 18 insertions(+) create mode 100644 resource/sqlupgrade/DM/sql202401080103.sql create mode 100644 resource/sqlupgrade/GS/sql202401080103.sql create mode 100644 resource/sqlupgrade/JC/sql202401080103.sql create mode 100644 resource/sqlupgrade/Mysql/sql202401080103.sql create mode 100644 resource/sqlupgrade/Oracle/sql202401080103.sql create mode 100644 resource/sqlupgrade/PG/sql202401080103.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202401080103.sql create mode 100644 resource/sqlupgrade/ST/sql202401080103.sql diff --git a/resource/sqlupgrade/DM/sql202401080103.sql b/resource/sqlupgrade/DM/sql202401080103.sql new file mode 100644 index 000000000..754d4529d --- /dev/null +++ b/resource/sqlupgrade/DM/sql202401080103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_item add width int null; +/ + diff --git a/resource/sqlupgrade/GS/sql202401080103.sql b/resource/sqlupgrade/GS/sql202401080103.sql new file mode 100644 index 000000000..754d4529d --- /dev/null +++ b/resource/sqlupgrade/GS/sql202401080103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_item add width int null; +/ + diff --git a/resource/sqlupgrade/JC/sql202401080103.sql b/resource/sqlupgrade/JC/sql202401080103.sql new file mode 100644 index 000000000..754d4529d --- /dev/null +++ b/resource/sqlupgrade/JC/sql202401080103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_item add width int null; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202401080103.sql b/resource/sqlupgrade/Mysql/sql202401080103.sql new file mode 100644 index 000000000..f5fb1c6f1 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202401080103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_item add width int null; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202401080103.sql b/resource/sqlupgrade/Oracle/sql202401080103.sql new file mode 100644 index 000000000..fc148da4a --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202401080103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_item add width int null +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202401080103.sql b/resource/sqlupgrade/PG/sql202401080103.sql new file mode 100644 index 000000000..f5fb1c6f1 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202401080103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_item add width int null; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202401080103.sql b/resource/sqlupgrade/SQLServer/sql202401080103.sql new file mode 100644 index 000000000..ff92fddf9 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202401080103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_item add width int null +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202401080103.sql b/resource/sqlupgrade/ST/sql202401080103.sql new file mode 100644 index 000000000..754d4529d --- /dev/null +++ b/resource/sqlupgrade/ST/sql202401080103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_item add width int null; +/ + From f5aa425f2cca9b0d11ec3351d8b7465ef4bc2d56 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 9 Jan 2024 13:21:45 +0800 Subject: [PATCH 040/169] =?UTF-8?q?fix=E5=85=AC=E5=BC=8F=EF=BC=8C=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=8A=B6=E6=80=81=E5=8F=98=E9=87=8F=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=80=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/bo/CalculateFormulaVarBO.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java index 74835472d..8251ea51f 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/CalculateFormulaVarBO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryacct.bo; +import cn.hutool.core.util.NumberUtil; import com.engine.salary.annotation.SalaryFormulaVar; import com.engine.salary.common.LocalDateRange; import com.engine.salary.constant.SalaryFormulaFieldConstant; @@ -18,6 +19,7 @@ import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveTaxAgentDataDTO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO; +import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salaryformula.SalaryFormulaReferenceEnum; import com.engine.salary.enums.salaryformula.SalarySQLReferenceEnum; import com.engine.salary.enums.salarysob.SalarySobAdjustRuleTypeEnum; @@ -551,6 +553,10 @@ public class CalculateFormulaVarBO { } // 填充到返回结果集中 employeeMap.forEach((key, po) -> { + // 获取po的状态 + if(po.getStatus() != null && NumberUtil.isNumber(po.getStatus())) { + po.setStatusName(UserStatusEnum.getDefaultLabelByValue(new Integer(po.getStatus()))); + } List formulaVarValues = resultMap.computeIfAbsent(key, k -> Lists.newArrayList()); Map map = JsonUtil.parseMap(po, String.class); formulaVarValues.addAll(fieldNames.stream().map(fieldName -> { From 3b761341fcc14e9f660e925ea7d87eed366c05e7 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 10 Jan 2024 11:20:36 +0800 Subject: [PATCH 041/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E6=95=B0=E8=87=AA=E5=8A=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 58 +++++++++++++++++++ .../service/impl/SISchemeServiceImpl.java | 35 ++++++++++- .../sys/constant/SalarySysConstant.java | 5 ++ 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 977adaab4..4f62417c6 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1217,6 +1217,64 @@ public class SIArchivesBiz { return true; } + + /** + * 校验福利基数是否符合上下限要求，并返回符合要求的数据 + * @param primaryId + * @param paymentBaseString + * @return + */ + public String checkAndBuildWelBaseWithLimit(Long primaryId, String paymentBaseString, Integer paymentScope) { + + if (primaryId ==null || paymentBaseString == null) { + return paymentBaseString; + } + Map paymentBaseJson = JSON.parseObject(paymentBaseString, HashMap.class); + Map newPaymentBaseJson = JSON.parseObject(paymentBaseString, HashMap.class); + if (paymentBaseJson == null) { + return null; + } + + for (Map.Entry entry : paymentBaseJson.entrySet()) { + + //判断福利值是否为空/数字 + if (entry.getValue() == null || entry.getValue().length() == 0) { + continue; + } else if (!isNumeric(entry.getValue())) { + log.info("福利值非数字！"); + newPaymentBaseJson.remove(entry.getKey()); + continue; + } + //根据福利方案id、险种id + List insuranceSchemeDetailPOList = getInsuranceSchemeDetailMapper().getByPI(primaryId, Long.valueOf(entry.getKey())); + log.info("福利方案id: {},, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey())); + if (insuranceSchemeDetailPOList.size() == 0) { + log.info("根据福利方案id、险种id、缴纳对象查询明细为null！福利方案id: {}, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey())); + newPaymentBaseJson.remove(entry.getKey()); + continue; + } + List checkList = insuranceSchemeDetailPOList.stream() + .filter(f -> f.getPaymentScope().equals(paymentScope)).collect(Collectors.toList()); + if (checkList.size() > 0) { + InsuranceSchemeDetailPO insuranceSchemeDetailPO = checkList.get(0); + encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); + String lowerLimit = "0.000".equals(insuranceSchemeDetailPO.getLowerLimit()) ? null : insuranceSchemeDetailPO.getLowerLimit(); + String upperLimit = "0.000".equals(insuranceSchemeDetailPO.getUpperLimit()) ? null : insuranceSchemeDetailPO.getUpperLimit(); + if (lowerLimit != null && lowerLimit.length() > 0 && Double.parseDouble(entry.getValue()) < Double.parseDouble(lowerLimit)) { + //数值低于对应福利明细下限 + log.info("社保基数 {} 数值 {} 低于对应福利明细下限 {}！", entry.getKey(), entry.getValue(), lowerLimit); + newPaymentBaseJson.put(entry.getKey(), lowerLimit); + } + if (upperLimit != null && upperLimit.length() > 0 && Double.parseDouble(entry.getValue()) > Double.parseDouble(upperLimit)) { + //数值高于对应福利明细上限 + log.info("社保基数 {} 数值 {} 高于对应福利明细上限 {} ！", entry.getKey(), entry.getValue(), upperLimit); + newPaymentBaseJson.put(entry.getKey(), upperLimit); + } + } + } + return JSON.toJSONString(newPaymentBaseJson); + } + /** * 档案列表 *

diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 5b2552ef9..da2c8b0ae 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -44,6 +44,7 @@ import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.*; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; +import com.engine.salary.sys.enums.OpenEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.*; @@ -74,6 +75,7 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import static com.engine.salary.sys.constant.SalarySysConstant.WEL_BASE_AUTO_ADJUST; import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; /** @@ -1263,7 +1265,12 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //生成福利档案基础信息数据 InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = buildBaseInfoPO(employeeId, singleAccount, paymentNameIdMap, creator, runStatus, employees.get(0).isExtEmp()); - if (!isError) { + + //判断是否福利档案导入时，不符合上下限的基数调整为上限/下限 + SalarySysConfPO welBaseAutoAdjust = getSalarySysConfService(user).getOneByCode(WEL_BASE_AUTO_ADJUST); + boolean welBaseAutoAdjustSign = welBaseAutoAdjust != null && welBaseAutoAdjust.getConfValue().equals(OpenEnum.OPEN.getValue()); + + if (!isError && !welBaseAutoAdjustSign) { insuranceArchivesAccountPO.setSocial(insuranceArchivesSocialSchemePO); insuranceArchivesAccountPO.setFund(insuranceArchivesFundSchemePO); insuranceArchivesAccountPO.setOther(insuranceArchivesOtherSchemePO); @@ -1304,6 +1311,32 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { isError = true; } + } else if (!isError) { + //校验福利基数是否符合上下限要求，不符合上下限的基数调整为上限 /下限 + String newSocialPaymentBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + String newFundPaymentBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + String newOtherPaymentBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + + insuranceArchivesSocialSchemePO.setSocialPaymentBaseString(newSocialPaymentBaseString); + insuranceArchivesFundSchemePO.setFundPaymentBaseString(newFundPaymentBaseString); + insuranceArchivesOtherSchemePO.setOtherPaymentBaseString(newOtherPaymentBaseString); + + if (welBaseDiffSign) { + String newSocialPaymentComBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + String newFundPaymentComBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + String newOtherPaymentComBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + + insuranceArchivesSocialSchemePO.setSocialPaymentComBaseString(newSocialPaymentComBaseString); + insuranceArchivesFundSchemePO.setFundPaymentComBaseString(newFundPaymentComBaseString); + insuranceArchivesOtherSchemePO.setOtherPaymentComBaseString(newOtherPaymentComBaseString); + } + + insuranceArchivesAccountPO.setSocial(insuranceArchivesSocialSchemePO); + insuranceArchivesAccountPO.setFund(insuranceArchivesFundSchemePO); + insuranceArchivesAccountPO.setOther(insuranceArchivesOtherSchemePO); + insuranceArchivesAccountPO.setBaseInfo(insuranceArchivesBaseInfoPO); + + insuranceArchivesAccountPOS.add(insuranceArchivesAccountPO); } return isError; } diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index df5ea5ea2..afe54d3c0 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -110,4 +110,9 @@ public class SalarySysConstant { * 应用设置是否福利档案基数区分个人和单位 */ public static final String WEL_BASE_DIFF_BY_PER_AND_COM = "welBaseDiffByPerAndCom"; + + /** + * 应用设置是否福利档案导入时，不符合上下限的基数调整为上限 /下限 + */ + public static final String WEL_BASE_AUTO_ADJUST = "welBaseAutoAdjust"; } From be68f01145cca15a1f0d5416a0ff6e463a428a85 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 15 Jan 2024 09:45:19 +0800 Subject: [PATCH 042/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8Cmysql=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=B8=ADsql=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/Mysql/sql202312130203.sql | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resource/sqlupgrade/Mysql/sql202312130203.sql b/resource/sqlupgrade/Mysql/sql202312130203.sql index 7ff70da9f..15acb233a 100644 --- a/resource/sqlupgrade/Mysql/sql202312130203.sql +++ b/resource/sqlupgrade/Mysql/sql202312130203.sql @@ -1,17 +1,17 @@ -ALTER TABLE hrsa_social_archives ADD COLUMN social_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_fund_archives ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_other_archives ADD COLUMN other_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_social_archives ADD COLUMN social_payment_com_base_string text NULL; +ALTER TABLE hrsa_fund_archives ADD COLUMN fund_payment_com_base_string text NULL; +ALTER TABLE hrsa_other_archives ADD COLUMN other_payment_com_base_string text NULL; -ALTER TABLE hrsa_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail ADD COLUMN social_payment_com_base_string text NULL; +ALTER TABLE hrsa_bill_detail ADD COLUMN fund_payment_com_base_string text NULL; +ALTER TABLE hrsa_bill_detail ADD COLUMN other_payment_com_base_string text NULL; -ALTER TABLE hrsa_bill_detail_temp ADD COLUMN social_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_bill_detail_temp ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_bill_detail_temp ADD COLUMN other_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN social_payment_com_base_string text NULL; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN fund_payment_com_base_string text NULL; +ALTER TABLE hrsa_bill_detail_temp ADD COLUMN other_payment_com_base_string text NULL; -ALTER TABLE hrsa_excel_bill_detail ADD COLUMN social_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_excel_bill_detail ADD COLUMN fund_payment_com_base_string varchar(4000) NULL; -ALTER TABLE hrsa_excel_bill_detail ADD COLUMN other_payment_com_base_string varchar(4000) NULL; +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN social_payment_com_base_string text NULL; +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN fund_payment_com_base_string text NULL; +ALTER TABLE hrsa_excel_bill_detail ADD COLUMN other_payment_com_base_string text NULL; ALTER TABLE hrsa_insurance_base_history ADD COLUMN payment_scope varchar(10) NULL; From e38fd9be992244d5aeb32b36fdda0d9bdc7004f9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 15 Jan 2024 10:51:53 +0800 Subject: [PATCH 043/169] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=B7=E5=A7=8B=E3=80=81=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=8F=91=E8=96=AA=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryArchiveQueryParam.java | 22 ++++++++++++ .../mapper/archive/SalaryArchiveMapper.xml | 36 +++++++++++++++++++ .../impl/SalaryArchiveServiceImpl.java | 13 +++++++ 3 files changed, 71 insertions(+) diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index 12a02998d..505ce3264 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Collection; +import java.util.Date; import java.util.List; /** @@ -88,4 +89,25 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { */ private boolean extSalaryArchiveList; + + private String payStartDateStartDateStr; + private String payStartDateEndDateStr; + + // 起始发薪日期起 + private Date payStartDateStartDate; + + // 起始发薪日期止 + private Date payStartDateEndDate; + + // 最后发薪日期起 + private String payEndDateStartDateStr; + // 最后发薪日期止 + private String payEndDateEndDateStr; + + // 最后发薪日期起 + private Date payEndDateStartDate; + + // 最后发薪日期止 + private Date payEndDateEndDate; + } diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 03facc683..ea4f6498b 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -183,6 +183,18 @@ #{runStatus} + + AND pay_start_date = ]]> #{param.payStartDateStartDate} + + + AND pay_start_date #{param.payStartDateEndDate} + + + AND pay_end_date = ]]> #{param.payEndDateStartDate} + + + AND pay_end_date #{param.payEndDateEndDate} + ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc} @@ -264,6 +276,18 @@ #{runStatus} + + AND pay_start_date = ]]> #{param.payStartDateStartDate} + + + AND pay_start_date = ]]> #{param.payStartDateEndDate} + + + AND pay_end_date = ]]> #{param.payEndDateStartDate} + + + AND pay_end_date = ]]> #{param.payEndDateEndDate} + ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc} @@ -346,6 +370,18 @@ #{runStatus} + + AND pay_start_date = ]]> #{param.payStartDateStartDate} + + + AND pay_start_date = ]]> #{param.payStartDateEndDate} + + + AND pay_end_date = ]]> #{param.payEndDateStartDate} + + + AND pay_end_date = ]]> #{param.payEndDateEndDate} + ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc} diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 5ba7bd575..1fbe1b525 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -163,6 +163,19 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe if (queryParam.isExtSalaryArchiveList()) { return getSalaryArchiveMapper().listExtSalaryArchive(queryParam); } + if (StringUtils.isNotBlank(queryParam.getPayStartDateStartDateStr())) { + queryParam.setPayStartDateStartDate(SalaryDateUtil.stringToDate(queryParam.getPayStartDateStartDateStr())); + } + if (Objects.nonNull(queryParam.getPayStartDateEndDateStr())) { + queryParam.setPayStartDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayStartDateEndDateStr())); + } + + if (StringUtils.isNotBlank(queryParam.getPayEndDateStartDateStr())) { + queryParam.setPayEndDateStartDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateStartDateStr())); + } + if (Objects.nonNull(queryParam.getPayEndDateEndDateStr())) { + queryParam.setPayEndDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateEndDateStr())); + } return getSalaryArchiveMapper().list(queryParam); } From 0a6467aaa6e5749b531d3d460a9cd108cdb46812 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 15 Jan 2024 18:48:05 +0800 Subject: [PATCH 044/169] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=B7=E5=A7=8B=E3=80=81=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=8F=91=E8=96=AA=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/mapper/archive/SalaryArchiveMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index ea4f6498b..c08dd87e2 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -280,13 +280,13 @@ AND pay_start_date = ]]> #{param.payStartDateStartDate} - AND pay_start_date = ]]> #{param.payStartDateEndDate} + AND pay_start_date #{param.payStartDateEndDate} AND pay_end_date = ]]> #{param.payEndDateStartDate} - AND pay_end_date = ]]> #{param.payEndDateEndDate} + AND pay_end_date #{param.payEndDateEndDate} @@ -374,13 +374,13 @@ AND pay_start_date = ]]> #{param.payStartDateStartDate} - AND pay_start_date = ]]> #{param.payStartDateEndDate} + AND pay_start_date #{param.payStartDateEndDate} AND pay_end_date = ]]> #{param.payEndDateStartDate} - AND pay_end_date = ]]> #{param.payEndDateEndDate} + AND pay_end_date #{param.payEndDateEndDate} From db4b44e62cd5ca7d4746494288ffc34495f91a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 16 Jan 2024 16:35:37 +0800 Subject: [PATCH 045/169] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BA=BA=E5=91=98=E7=8A=B6=E6=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryArchiveServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 5ba7bd575..aa3b0eaf3 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -320,11 +320,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe @Override public void deleteSalaryArchive(Collection salaryArchiveIds) { - if(CollectionUtils.isEmpty(salaryArchiveIds)){ + if (CollectionUtils.isEmpty(salaryArchiveIds)) { throw new SalaryRunTimeException("薪资档案参数为空!"); } SalarySysConfPO canDelete = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_ARCHIVE_DELETE); - if(Objects.isNull(canDelete) || StringUtils.equals(canDelete.getConfValue(),"0") ){ + if (Objects.isNull(canDelete) || StringUtils.equals(canDelete.getConfValue(), "0")) { throw new SalaryRunTimeException("不允许删除薪资档案，请先开启删除档案规则配置！"); } List salaryArchiveList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(salaryArchiveIds).build()); @@ -333,17 +333,17 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe List canDeleteTaxAgentIds = getTaxAgentService(user).listAllTaxAgentsAsAdmin((long) user.getUID()) .stream().map(TaxAgentPO::getId).collect(Collectors.toList()); boolean err = salaryArchiveList.stream().anyMatch(po -> !canDeleteTaxAgentIds.contains(po.getTaxAgentId())); - if(CollectionUtils.isEmpty(salaryArchiveList) || err){ + if (CollectionUtils.isEmpty(salaryArchiveList) || err) { throw new SalaryRunTimeException("薪资档案不存在，或没有权限删除该薪资档案！"); } Optional fixedList = salaryArchiveList.stream().filter(archive -> !StringUtils.equals(archive.getRunStatus(), SalaryArchiveStatusEnum.PENDING.getValue()) && !StringUtils.equals(archive.getRunStatus(), SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue())).findFirst(); - if(fixedList.isPresent()){ + if (fixedList.isPresent()) { throw new SalaryRunTimeException("发薪员工、待停薪员工、停薪_来自待停薪，无法删除薪资档案！"); } List deleteIds = salaryArchiveList.stream().map(SalaryArchivePO::getId).collect(Collectors.toList()); // 删除薪资档案及档案项目 - if(CollectionUtils.isNotEmpty(deleteIds)){ + if (CollectionUtils.isNotEmpty(deleteIds)) { getSalaryArchiveMapper().deleteByIds(deleteIds); getSalaryArchiveItemMapper().deleteBySalaryArchiveId(deleteIds); } @@ -432,7 +432,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe List salaryItemIds = salaryItems.stream().map(SalaryItemPO::getId).collect(Collectors.toList()); // 1.获取薪资档案所对应的当前生效的薪资项目数据 List salaryArchiveItemList = Collections.emptyList(); - if(CollectionUtils.isNotEmpty(ids) && CollectionUtils.isNotEmpty(salaryItemIds) || !isPage){ + if (CollectionUtils.isNotEmpty(ids) && CollectionUtils.isNotEmpty(salaryItemIds) || !isPage) { salaryArchiveItemList = getCurrentEffectiveItemList(ids, salaryItemIds); } List finalSalaryArchiveItemList = salaryArchiveItemList; @@ -461,7 +461,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 3.组装数据 List> listMaps = new ArrayList<>(); salaryArchives.forEach(e -> { - e.setEmployeeStatus(UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(e.getEmployeeStatus()))); + e.setEmployeeStatus(NumberUtils.isCreatable(e.getEmployeeStatus()) ? UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(e.getEmployeeStatus())) : ""); Map map = new LinkedHashMap<>(); map.put("id", e.getId()); @@ -757,11 +757,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 获取核算人员规则 List statusList = Collections.emptyList(); SalarySysConfPO employeeRule = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_ACCT_EMPLOYEE_RULE); - if(Objects.isNull(employeeRule) || StringUtils.equals(employeeRule.getConfValue(), SalaryAcctEmployeeRuleEnum.BYPAYENDTIME.getValue())){ + if (Objects.isNull(employeeRule) || StringUtils.equals(employeeRule.getConfValue(), SalaryAcctEmployeeRuleEnum.BYPAYENDTIME.getValue())) { // 默认包含停薪列表 statusList = Arrays.asList(SalaryArchiveStatusEnum.FIXED.getValue(), SalaryArchiveStatusEnum.SUSPEND.getValue(), - SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue() ); - }else{ + SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue()); + } else { // 仅包含发薪、待定薪 statusList = Arrays.asList(SalaryArchiveStatusEnum.FIXED.getValue(), SalaryArchiveStatusEnum.SUSPEND.getValue()); } From a3aa0f5ca10a9228a548b9e16cef3ca64cfe53b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 17 Jan 2024 10:55:42 +0800 Subject: [PATCH 046/169] =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E6=96=87?= =?UTF-8?q?=E5=AD=97=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/util/page/SalaryPageUtil.java | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/com/engine/salary/util/page/SalaryPageUtil.java b/src/com/engine/salary/util/page/SalaryPageUtil.java index bc8892eee..a91fe1d2a 100644 --- a/src/com/engine/salary/util/page/SalaryPageUtil.java +++ b/src/com/engine/salary/util/page/SalaryPageUtil.java @@ -3,6 +3,9 @@ package com.engine.salary.util.page; import com.github.pagehelper.PageHelper; import org.apache.commons.collections4.CollectionUtils; +import java.awt.*; +import java.awt.font.FontRenderContext; +import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -91,18 +94,23 @@ public class SalaryPageUtil { endIndex > source.size() ? source.size() : endIndex); } + + static Font font = new Font("Arial", Font.PLAIN, 12); // 设置字体样式、大小等属性 + static FontRenderContext frc = new FontRenderContext(null, true, false); +// GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + + /** + * 自适应文字长度 + * @param chars + * @param width + * @return + */ public static String selfAdaption(String chars, Integer width) { - if (width != null && width != 0){ + if (width != null && width != 0) { return width + ""; } - int adaption = 0; - - if (chars != null) { - adaption = chars.length() * 12 + 55; - } - if (adaption < 79) { - adaption = 79; - } - return adaption + ""; + Rectangle2D bounds = font.getStringBounds(chars, frc); + int pxLength = (int) Math.ceil(bounds.getWidth()); + return pxLength + 55 + ""; } } From 29e5c27ffb15d6072c37cea9eff14f5fed8b5255 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 17 Jan 2024 16:07:27 +0800 Subject: [PATCH 047/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=B9=B6=E5=BD=92=E6=A1=A3=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/siaccount/param/AccountParam.java | 3 + .../salary/service/SIAccountService.java | 7 + .../service/impl/SIAccountServiceImpl.java | 1139 ++++++++++++++++- .../salary/timer/AutoSiAccountAndFileJob.java | 107 ++ 4 files changed, 1223 insertions(+), 33 deletions(-) create mode 100644 src/com/engine/salary/timer/AutoSiAccountAndFileJob.java diff --git a/src/com/engine/salary/entity/siaccount/param/AccountParam.java b/src/com/engine/salary/entity/siaccount/param/AccountParam.java index ceff087e9..34e11c6e5 100644 --- a/src/com/engine/salary/entity/siaccount/param/AccountParam.java +++ b/src/com/engine/salary/entity/siaccount/param/AccountParam.java @@ -42,4 +42,7 @@ public class AccountParam { @DataCheck(require = true,message = "个税扣缴义务人不能为空") private Long paymentOrganization; + // 是否核算后归档 + private boolean fileFlag = false; + } diff --git a/src/com/engine/salary/service/SIAccountService.java b/src/com/engine/salary/service/SIAccountService.java index 99c157855..60d06ed86 100644 --- a/src/com/engine/salary/service/SIAccountService.java +++ b/src/com/engine/salary/service/SIAccountService.java @@ -84,6 +84,13 @@ public interface SIAccountService { */ String save(AccountParam param); + /** + * 新建核算并归档 + * @param param + * @return + */ + String saveAndFile(AccountParam param); + /** * 正常缴纳页核算 * @param saveCommonAccountParam diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index cbed96243..6bb0fd1f2 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -1,6 +1,7 @@ package com.engine.salary.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.api.browser.bean.SearchConditionOption; @@ -10,24 +11,20 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.*; +import com.engine.salary.cache.SalaryCacheKey; import com.engine.salary.component.SalaryWeaTable; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.progress.ProgressDTO; import com.engine.salary.entity.siaccount.bo.InsuranceAccountBO; import com.engine.salary.entity.siaccount.dto.InsuranceAccountBatchListDTO; import com.engine.salary.entity.siaccount.dto.InsuranceAccountTabDTO; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; import com.engine.salary.entity.siaccount.dto.InsuranceAcctDetailImportFieldDTO; import com.engine.salary.entity.siaccount.param.*; -import com.engine.salary.entity.siaccount.po.ExcelInsuranceDetailPO; -import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO; -import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; -import com.engine.salary.entity.siaccount.po.InsuranceAccountInspectPO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesEmployeePO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; +import com.engine.salary.entity.siaccount.po.*; +import com.engine.salary.entity.siarchives.po.*; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.siexport.param.InsuranceExportParam; import com.engine.salary.entity.siexport.po.AccountExportPO; @@ -40,12 +37,10 @@ import com.engine.salary.enums.siaccount.*; import com.engine.salary.enums.sicategory.*; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.InsuranceExportMapper; -import com.engine.salary.mapper.siaccount.ExcelInsuranceDetailMapper; -import com.engine.salary.mapper.siaccount.InsuranceAccountBatchMapper; -import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; -import com.engine.salary.mapper.siaccount.InsuranceAccountInspectMapper; +import com.engine.salary.mapper.siaccount.*; import com.engine.salary.mapper.siarchives.FundSchemeMapper; import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; +import com.engine.salary.mapper.siarchives.OtherSchemeMapper; import com.engine.salary.mapper.siarchives.SocialSchemeMapper; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; @@ -53,14 +48,13 @@ import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.*; +import com.engine.salary.sys.constant.SalarySysConstant; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; +import com.engine.salary.sys.enums.SalaryAcctEmployeeRuleEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; -import com.engine.salary.util.SalaryDateUtil; -import com.engine.salary.util.SalaryEntityUtil; -import com.engine.salary.util.SalaryFormItemUtil; -import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.*; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; @@ -73,13 +67,16 @@ import com.engine.salary.util.valid.ValidUtil; import com.engine.salary.wrapper.SalaryFormulaWrapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.mzlion.core.utils.BeanUtils; import dm.jdbc.util.IdGenerator; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.BeanUtils; import weaver.file.ImageFileManager; import weaver.general.Util; import weaver.hrm.User; @@ -89,6 +86,7 @@ import java.math.BigDecimal; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -102,6 +100,7 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; * @Date 2022/4/11 * @Version V1.0 **/ +@Slf4j public class SIAccountServiceImpl extends Service implements SIAccountService { // private SIAccountBiz siAccountBiz = new SIAccountBiz(); @@ -180,6 +179,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return MapperProxyFactory.getProxy(FundSchemeMapper.class); } + private OtherSchemeMapper getOtherSchemeMapper() { + return MapperProxyFactory.getProxy(OtherSchemeMapper.class); + } + private TaxAgentBiz taxAgentBiz = new TaxAgentBiz(); private ICategoryMapper getICategoryMapper() { @@ -210,6 +213,18 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return (SIBalanceService) ServiceUtil.getService(SIBalanceServiceImpl.class, user); } + private ProgressService getSalaryAcctProgressService(User user) { + return ServiceUtil.getService(ProgressServiceImpl.class, user); + } + + private SIAccountDetailTempMapper getSIAccountDetailTempMapper() { + return MapperProxyFactory.getProxy(SIAccountDetailTempMapper.class); + } + + private InsuranceCompensationMapper getInsuranceCompensationMapper() { + return MapperProxyFactory.getProxy(InsuranceCompensationMapper.class); + } + @Override public Map listPage(InsuranceAccountBatchParam queryParam) { Long employeeId = (long) user.getUID(); @@ -563,20 +578,22 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public String save(AccountParam param) { - ValidUtil.doValidator(param); - - Long employeeId = (long) user.getUID(); - String lastName = user.getLastname(); - return getSiAccountBiz(user).save(param.isFlag(), param, employeeId, lastName); +// ValidUtil.doValidator(param); +// +// Long employeeId = (long) user.getUID(); +// String lastName = user.getLastname(); +// return getSiAccountBiz(user).save(param.isFlag(), param, employeeId, lastName); + return saveAndFile(param); } @Override public void commonAccount(SaveCommonAccountParam param) { - ValidUtil.doValidator(param); - - Long employeeId = (long) user.getUID(); - String currentUserName = user.getLastname(); - getSiAccountBiz(user).saveCommonAccount(param, employeeId, currentUserName); +// ValidUtil.doValidator(param); +// +// Long employeeId = (long) user.getUID(); +// String currentUserName = user.getLastname(); +// getSiAccountBiz(user).saveCommonAccount(param, employeeId, currentUserName); + siSaveCommonAccount(param); } @Override @@ -587,9 +604,31 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public void saveCommonAccount(SaveCommonAccountParam accountParam) { - Long employeeId = (long) user.getUID(); - String currentUserName = user.getLastname(); - getSiAccountBiz(user).saveCommonAccount(accountParam, employeeId, currentUserName); +// Long employeeId = (long) user.getUID(); +// String currentUserName = user.getLastname(); +// getSiAccountBiz(user).saveCommonAccount(accountParam, employeeId, currentUserName); + siSaveCommonAccount(accountParam); + } + + /** + * 福利台账正常缴纳页-核算 + */ + public void siSaveCommonAccount(SaveCommonAccountParam param) { + ValidUtil.doValidator(param); + + List collect; + SalaryAssert.notEmpty(param.getIncludes(), SalaryI18nUtil.getI18nLabel(100466, "参数为空")); + SalaryAssert.notNull(param.getBillMonth(), SalaryI18nUtil.getI18nLabel(100467, "账单月为空")); + if (CollectionUtils.isNotEmpty(param.getExcludes())) { + collect = param.getIncludes().stream().filter(item -> !param.getExcludes().contains(item)).collect(Collectors.toList()); + } else { + collect = param.getIncludes(); + } + SalaryAssert.notEmpty(collect, SalaryI18nUtil.getI18nLabel(99920, "无核算人员")); + AccountParam accountParam = new AccountParam(); + accountParam.setBillMonth(param.getBillMonth()); + accountParam.setIds(collect); + siAccounting(accountParam); } @Override @@ -618,9 +657,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public void file(AccountParam accountParam) { - Long employeeId = (long) user.getUID(); - String billMonth = accountParam.getBillMonth(); - getSiAccountBiz(user).file(billMonth, employeeId, accountParam.getPaymentOrganization()); +// Long employeeId = (long) user.getUID(); +// String billMonth = accountParam.getBillMonth(); +// getSiAccountBiz(user).file(billMonth, employeeId, accountParam.getPaymentOrganization()); + siFile(accountParam.getBillMonth(), accountParam.getPaymentOrganization()); } @Override @@ -4279,4 +4319,1037 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { insuranceAccountDetailPO.setOtherComSum(otherComSum.toPlainString()); return insuranceAccountDetailPO; } + + /** + * 新建核算并归档 + * @param param + * @return + */ + @Override + public String saveAndFile(AccountParam param) { + ValidUtil.doValidator(param); + if (param.isFlag()) { + InsuranceAccountBatchPO insuranceAccountBatchPO = getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), param.getPaymentOrganization()); + insuranceAccountBatchPO = encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); + SalaryAssert.isNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(0, "所属月份存在核算数据")); + + InsuranceAccountBatchPO build = InsuranceAccountBatchPO.builder() + .paymentOrganization(param.getPaymentOrganization()) + .accountant(user.getLastname()) + .billMonth(param.getBillMonth()) + .billStatus(BillStatusEnum.NOT_ARCHIVED.getValue()) + .remarks(param.getRemarks()) + .creator((long) user.getUID()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .createTime(new Date()) + .updateTime(new Date()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .paymentOrganization(param.getPaymentOrganization()) + .socialPay("0") + .fundPay("0") + .otherPay("0") + .build(); + encryptUtil.encrypt(build, InsuranceAccountBatchPO.class); + getInsuranceAccountBatchMapper().insert(build); +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetId(String.valueOf(build.getId())); +// insuranceSchemeContext.setTargetName(build.getBillMonth()); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.ADD.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100462, "新增台账")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100462, "新增台账")); +// insuranceSchemeContext.setNewValues(build); +// siAccountLoggerTemplate.write(insuranceSchemeContext); + } + try { + List employeeIds = getInsuranceAccountDetailMapper().selectEmpByPaymentOrg(param.getPaymentOrganization()); + if (CollectionUtils.isEmpty(employeeIds)) { + List list = Lists.newArrayList(getInsuranceAccountDetailMapper().queryNormalListByBillMonth(param.getBillMonth(), param.getPaymentOrganization())); + encryptUtil.decryptList(list, InsuranceAccountDetailPO.class); + if (CollectionUtils.isNotEmpty(list)) { + list.stream().forEach(f -> { + getInsuranceAccountDetailMapper().deleteById(f.getId()); + }); + } + } + SalaryAssert.notEmpty(employeeIds, SalaryI18nUtil.getI18nLabel(0, "没有需要核算的人员")); +// AccountParam selectParam = new AccountParam(); +// selectParam.setBillMonth(param.getBillMonth()); +// selectParam.setPaymentOrganization(param.getPaymentOrganization()); + ExecutorService taskExecutor = Executors.newCachedThreadPool(); + taskExecutor.execute(() -> { + siAccounting(param); + if (param.isFileFlag()) { + siFile(param.getBillMonth(), param.getPaymentOrganization()); + } + }); + } catch (Exception e) { + // 回滚 + List list = Lists.newArrayList(getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), param.getPaymentOrganization())); + list = encryptUtil.decryptList(list, InsuranceAccountBatchPO.class); + if (CollectionUtils.isNotEmpty(list)) { + list.stream().forEach(f -> { + getInsuranceAccountBatchMapper().deleteById(f.getId()); + }); + } + throw new SalaryRunTimeException(e.getMessage()); + } + return String.valueOf(user.getUID()); + } + + + public void siAccounting(AccountParam param) { + //福利核算进度 + ProgressDTO salaryAcctProgressDTO = getSalaryAcctProgressService(user).getProgress(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth()); + if (salaryAcctProgressDTO != null && salaryAcctProgressDTO.isStatus() && salaryAcctProgressDTO.getProgress().compareTo(BigDecimal.ONE) < 0) { + return; + } + + log.info("开始核算，当前操作人为:{}", user.getLastname()); + log.info("核算时间:{}, 核算月份:{}, 个税扣缴义务人:{}, 是否首次核算:{}", new Date(), param.getBillMonth(), param.getPaymentOrganization(), param.isFlag()); + try { + List ids; + List validIds = new ArrayList<>(); + if (CollectionUtils.isEmpty(param.getIds())) { + List empIds = getInsuranceAccountDetailMapper().selectEmpByPaymentOrg(param.getPaymentOrganization()); + // 获取薪资核算人员规则 + SalarySysConfPO salaryAcctEmployeeRule = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_ACCT_EMPLOYEE_RULE); + List status = new ArrayList<>(); + if(Objects.isNull(salaryAcctEmployeeRule) || StringUtils.equals(salaryAcctEmployeeRule.getConfValue(), SalaryAcctEmployeeRuleEnum.BYPAYENDTIME.getValue()) ){ + // 包含停缴 + status = Arrays.asList(EmployeeStatusEnum.PAYING.getValue(),EmployeeStatusEnum.STAY_DEL.getValue(), + EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue()); + }else{ + status = Arrays.asList(EmployeeStatusEnum.PAYING.getValue(),EmployeeStatusEnum.STAY_DEL.getValue()); + } + List finalStatus = status; + //过滤出需要核算的人员，即福利档案基础信息表中runStatus为正在缴纳和待减员的人员 + List baseInfoPOList = getInsuranceBaseInfoMapper().listAll(); + List canAccountIds = baseInfoPOList.stream() + .filter(f->f.getPaymentOrganization().equals(param.getPaymentOrganization()) + && (finalStatus.contains(f.getRunStatus()) )) + .map(InsuranceArchivesBaseInfoPO::getEmployeeId) + .collect(Collectors.toList()); + + //20231122逻辑优化，过滤出不在起始缴纳月和最后缴纳月区间的人员 + List empIdsInPayMonthRange = listCanPayEmpIds(param.getPaymentOrganization(), param.getBillMonth()); + empIds = empIds.stream().filter(f->canAccountIds.contains(f) && empIdsInPayMonthRange.contains(f)).collect(Collectors.toList()); + + List socials = siArchivesBiz.getSocialByEmployeeIds(empIds); + //过滤出目标个税扣缴义务人相关信息 + socials = socials.stream().filter(f -> f.getPaymentOrganization().equals(param.getPaymentOrganization())).collect(Collectors.toList()); + List emp1 = socials.stream() + .filter(s -> !(StringUtils.isBlank(s.getSocialEndTime()) && StringUtils.isBlank(s.getSocialStartTime())) && + (StringUtils.isBlank(s.getSocialEndTime()) || (SalaryDateUtil.stringToDate(s.getSocialEndTime() + "-01") != null && !SalaryDateUtil.stringToDate(param.getBillMonth() + "-01").after(SalaryDateUtil.stringToDate(s.getSocialEndTime() + "-01")))) ) + .map(InsuranceArchivesSocialSchemePO::getEmployeeId) + .collect(Collectors.toList()); + + List funds = siArchivesBiz.getFundByEmployeeIds(empIds); + //过滤出目标个税扣缴义务人相关信息 + funds = funds.stream().filter(f -> f.getPaymentOrganization().equals(param.getPaymentOrganization())).collect(Collectors.toList()); + List emp2 = funds.stream() + .filter(s -> !(StringUtils.isBlank(s.getFundStartTime()) && StringUtils.isBlank(s.getFundEndTime())) && + (StringUtils.isBlank(s.getFundEndTime()) || (SalaryDateUtil.stringToDate(s.getFundEndTime() + "-01") != null && !SalaryDateUtil.stringToDate(param.getBillMonth() + "-01").after(SalaryDateUtil.stringToDate(s.getFundEndTime() + "-01"))))) + .map(InsuranceArchivesFundSchemePO::getEmployeeId) + .collect(Collectors.toList()); + + List others = siArchivesBiz.getOtherByEmployeeIds(empIds); + //过滤出目标个税扣缴义务人相关信息 + others = others.stream().filter(f -> f.getPaymentOrganization().equals(param.getPaymentOrganization())).collect(Collectors.toList()); + List emp3 = others.stream() + .filter(s -> !(StringUtils.isBlank(s.getOtherStartTime()) && StringUtils.isBlank(s.getOtherEndTime())) && + (StringUtils.isBlank(s.getOtherEndTime()) || (SalaryDateUtil.stringToDate(s.getOtherEndTime() + "-01") != null && !SalaryDateUtil.stringToDate(param.getBillMonth() + "-01").after(SalaryDateUtil.stringToDate(s.getOtherEndTime() + "-01"))))) + .map(InsuranceArchivesOtherSchemePO::getEmployeeId) + .collect(Collectors.toList()); + validIds.addAll(emp1); + validIds.addAll(emp2); + validIds.addAll(emp3); + + List finalValidIds = validIds.stream().distinct().collect(Collectors.toList()); + ids = empIds.stream().filter(finalValidIds::contains).collect(Collectors.toList()); + } else { + ids = param.getIds(); + } + + // 初始化进度 + ProgressDTO initProgress = new ProgressDTO() + .setTitle(SalaryI18nUtil.getI18nLabel(0, "核算中")) + .setTitleLabelId(97515L) + .setTotalQuantity(ids.size()) + .setCalculatedQuantity(NumberUtils.INTEGER_ZERO) + .setProgress(BigDecimal.ZERO) + .setStatus(true) + .setMessage(StringUtils.EMPTY); + getSalaryAcctProgressService(user).initProgress(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth(), initProgress); + + if (CollectionUtils.isEmpty(ids)) { + getSalaryAcctProgressService(user).finish(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth(), true); + return; + } + + log.info("开始生成福利核算数据，待处理人员数量:{}", ids.size()); + siCommonAccount(param.getBillMonth(), ids, param.getPaymentOrganization()); + log.info("福利核算数据生成完毕，开始数据处理"); + + handleData(ids, param); + log.info("福利核算数据处理完毕！"); + + List> partition = Lists.partition((List) ids, 100); + partition.forEach(part -> { + getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, param.getBillMonth(), param.getPaymentOrganization()); + }); + log.info("更新福利核算进度······"); + getSalaryAcctProgressService(user).finish(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth(), true); + log.info("福利核算进度完成！"); + } catch (Exception e) { + log.error("account run fail", e); + getSalaryAcctProgressService(user).fail(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth(), SalaryI18nUtil.getI18nLabel(0, "福利核算出错") + ": " + e.getMessage()); + + List list = Lists.newArrayList(getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), param.getPaymentOrganization())); + if (CollectionUtils.isNotEmpty(list)) { + list.stream().forEach(f -> { + getInsuranceAccountBatchMapper().deleteById(f.getId()); + }); + } + + } + + } + + public void siCommonAccount(String billMonth, List ids, Long paymentOrganization) { + SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + Map insuranceArchivesAccountPOS = siArchivesBiz.buildBatchAccount(ids, paymentOrganization); + List list = new ArrayList<>(); + int count = 0; + for (Map.Entry entry : insuranceArchivesAccountPOS.entrySet()) { + Long k = entry.getKey(); + InsuranceArchivesAccountPO v = entry.getValue(); + InsuranceAccountDetailPO insuranceAccountDetailPO = new InsuranceAccountDetailPO(); + insuranceAccountDetailPO.setBillMonth(billMonth); + insuranceAccountDetailPO.setBillStatus(BillStatusEnum.NOT_ARCHIVED.getValue()); + insuranceAccountDetailPO.setCreator((long) user.getUID()); + insuranceAccountDetailPO.setCreateTime(new Date()); + insuranceAccountDetailPO.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + insuranceAccountDetailPO.setEmployeeId(k); + insuranceAccountDetailPO.setUpdateTime(new Date()); + insuranceAccountDetailPO.setPaymentStatus(PaymentStatusEnum.COMMON.getValue()); + insuranceAccountDetailPO.setResourceFrom(ResourceFromEnum.SYSTEM.getValue()); + insuranceAccountDetailPO.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + insuranceAccountDetailPO.setPaymentOrganization(paymentOrganization); + + //核算社保 + accountSocial(insuranceAccountDetailPO, v, billMonth); + //核算公积金 + accountFund(insuranceAccountDetailPO, v, billMonth); + //核算其他福利 + accountOther(insuranceAccountDetailPO, v, billMonth); + //计算合计 + account(insuranceAccountDetailPO); + //临时表PO + InsuranceAccountDetailTempPO insuranceAccountDetailTempPO = new InsuranceAccountDetailTempPO(); + BeanUtils.copyProperties(insuranceAccountDetailPO, insuranceAccountDetailTempPO); + list.add(insuranceAccountDetailTempPO); + count++; + + if (count % 50 == 0 || count >= ids.size()) { + if (count >= ids.size()) { + getSalaryAcctProgressService(user).updateProgress(SalaryCacheKey.ACCT_PROGRESS + billMonth, BigDecimal.valueOf(0.99), false); + log.info("更新福利核算进度，当前进度为:{}", getSalaryAcctProgressService(user).getProgress(SalaryCacheKey.ACCT_PROGRESS + billMonth)); + } else { + getSalaryAcctProgressService(user).getAndAddCalculatedQty(SalaryCacheKey.ACCT_PROGRESS + billMonth, count >= ids.size() ? count % 50 : 50); + log.info("更新福利核算进度，当前进度为:{}", getSalaryAcctProgressService(user).getProgress(SalaryCacheKey.ACCT_PROGRESS + billMonth)); + } + + } + + } + //临时表入库前先对（可能存在的）历史数据进行删除 + List> partition = Lists.partition((List) ids, 100); + partition.forEach(part -> { + getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, billMonth, paymentOrganization); + }); + //临时表数据入库 + if (CollectionUtils.isNotEmpty(list)) { + encryptUtil.encryptList(list, InsuranceAccountDetailTempPO.class); + List> lists = splitList(list, 40); + lists.forEach(subList -> { + getSIAccountDetailTempMapper().batchSaveAccountTempDetails(subList); + }); + } + + } + + public InsuranceAccountDetailPO accountOther(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + if (accountPO.getOther() != null) { + InsuranceArchivesOtherSchemePO otherPO = accountPO.getOther(); + insuranceAccountDetailPO.setOtherPayOrg(otherPO.getPaymentOrganization()); + insuranceAccountDetailPO.setOtherSchemeId(otherPO.getOtherSchemeId()); + insuranceAccountDetailPO.setOtherPaymentBaseString(otherPO.getOtherPaymentBaseString()); + insuranceAccountDetailPO.setOtherPaymentComBaseString(otherPO.getOtherPaymentComBaseString()); + //判断是否在起始缴纳月和最后缴纳月之间 + Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), otherPO.getOtherStartTime(), otherPO.getOtherEndTime()); + if ((Objects.equals(NonPaymentEnum.YES.getValue(), otherPO.getNonPayment()) || otherPO.getNonPayment() == null) && otherPO.getOtherSchemeId() != null && inDataRange) { + List detailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(otherPO.getOtherSchemeId()); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); + //方案中包含的需要缴纳其他的个人福利 + int monthIndex = Integer.parseInt(billMonth.split("-")[1]) - 1; + Map otherPerson = detailPOS.stream() + .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_PERSON.getValue()) + && (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1")))) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesPerson = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); + //需要核算其他的福利id 个人 + List needArchivesPerson = new ArrayList<>(); + if (archivesPerson != null) { + archivesPerson.forEach((id, value) -> { + if (otherPerson.containsKey(Long.valueOf(id))) { + needArchivesPerson.add(Long.valueOf(id)); + } + }); + } + //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加 + if(otherPerson.size() > 0) { + otherPerson.forEach((id, object) -> { + if (!needArchivesPerson.contains(id)) { + needArchivesPerson.add(id); + } + }); + } + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(otherPerson, billMonth, otherPO.getOtherStartTime()); + + List otherPer = new ArrayList<>(); + Map otherPerJsonMap = new HashMap<>(); + needArchivesPerson.stream().forEach(e -> { + InsuranceSchemeDetailPO po = otherPerson.get(e); + BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (po.getPaymentCycle() != null && po.getPaymentCycle() == 1) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + otherPerJsonMap.put(String.valueOf(e), result.toPlainString()); + otherPer.add(result); + }); + insuranceAccountDetailPO.setOtherPerJson(JSON.toJSONString(otherPerJsonMap)); + BigDecimal otherPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : otherPer) { + otherPerSum = otherPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setOtherPerSum(otherPerSum.toPlainString()); + + //方案中包含的需要缴纳公积金的单位福利 + Map otherCom = detailPOS.stream() + .filter( + item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_COMPANY.getValue()) + && (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1")))) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(otherPO.getOtherPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(otherPO.getOtherPaymentBaseString(), new HashMap().getClass()); + } + //需要核算其他的福利id 单位 + List needArchivesCom = new ArrayList<>(); + if (archivesCom != null) { + archivesCom.forEach((id, value) -> { + if (otherCom.containsKey(Long.valueOf(id))) { + needArchivesCom.add(Long.valueOf(id)); + } + }); + } + //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加 + if(otherCom.size() > 0) { + otherCom.forEach((id, object) -> { + if (!needArchivesCom.contains(id)) { + needArchivesCom.add(id); + } + }); + } + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(otherCom, billMonth, otherPO.getOtherStartTime()); + + List otherComList = new ArrayList<>(); + Map otherComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; + needArchivesCom.stream().forEach(e -> { + InsuranceSchemeDetailPO po = otherCom.get(e); + BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (Objects.equals(po.getPaymentCycle(), 1)) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + otherComJsonMap.put(String.valueOf(e), result.toPlainString()); + otherComList.add(result); + }); + insuranceAccountDetailPO.setOtherComJson(JSON.toJSONString(otherComJsonMap)); + BigDecimal otherComSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : otherComList) { + otherComSum = otherComSum.add(bigDecimal); + } + insuranceAccountDetailPO.setOtherComSum(otherComSum.toPlainString()); + } + } + return insuranceAccountDetailPO; + } + + + public InsuranceAccountDetailPO accountFund(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + if (accountPO.getFund() != null) { + InsuranceArchivesFundSchemePO fundPO = accountPO.getFund(); + insuranceAccountDetailPO.setFundPayOrg(fundPO.getPaymentOrganization()); + insuranceAccountDetailPO.setFundAccount(fundPO.getFundAccount()); + insuranceAccountDetailPO.setSupplementFundAccount(fundPO.getSupplementFundAccount()); + insuranceAccountDetailPO.setFundSchemeId(fundPO.getFundSchemeId()); + insuranceAccountDetailPO.setFundPaymentBaseString(fundPO.getFundPaymentBaseString()); + insuranceAccountDetailPO.setFundPaymentComBaseString(fundPO.getFundPaymentComBaseString()); + //判断是否在起始缴纳月和最后缴纳月之间 + Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), fundPO.getFundStartTime(), fundPO.getFundEndTime()); + if ((NonPaymentEnum.YES.getValue().equals(fundPO.getNonPayment()) || fundPO.getNonPayment() == null) && fundPO.getFundSchemeId() != null && inDataRange) { + List detailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(fundPO.getFundSchemeId()); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); + //方案中包含的需要缴纳社保的个人福利 + int monthIndex = Integer.parseInt(billMonth.split("-")[1]) - 1; + Map fundperson = detailPOS.stream() + .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_PERSON.getValue()) + && (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1")))) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesPerson = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); + //需要核算公积金的福利id 个人 + List needArchivesPerson = new ArrayList<>(); + if (archivesPerson != null) { + archivesPerson.forEach((id, value) -> { + if (fundperson.containsKey(Long.valueOf(id))) { + needArchivesPerson.add(Long.valueOf(id)); + } + }); + } + //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加 + if(fundperson.size() > 0) { + fundperson.forEach((id, object) -> { + if (!needArchivesPerson.contains(id)) { + needArchivesPerson.add(id); + } + }); + } + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(fundperson, billMonth, fundPO.getFundStartTime()); + + List fundPer = new ArrayList<>(); + Map fundPerJsonMap = new HashMap<>(); + needArchivesPerson.stream().forEach(e -> { + InsuranceSchemeDetailPO po = fundperson.get(e); + BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (Objects.equals(po.getPaymentCycle(), 1)) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + fundPerJsonMap.put(String.valueOf(e), result.toPlainString()); + fundPer.add(result); + }); + insuranceAccountDetailPO.setFundPerJson(JSON.toJSONString(fundPerJsonMap)); + BigDecimal funPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : fundPer) { + funPerSum = funPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setFundPerSum(funPerSum.toPlainString()); + + //方案中包含的需要缴纳公积金的单位福利 + Map fundCom = detailPOS.stream() + .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_COMPANY.getValue()) + && (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1")))) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(fundPO.getFundPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(fundPO.getFundPaymentBaseString(), new HashMap().getClass()); + } + //需要核算公积金的福利id 单位 + List needArchivesCom = new ArrayList<>(); + if (archivesCom != null) { + archivesCom.forEach((id, value) -> { + if (fundCom.containsKey(Long.valueOf(id))) { + needArchivesCom.add(Long.valueOf(id)); + } + }); + } + //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加 + if(fundCom.size() > 0) { + fundCom.forEach((id, object) -> { + if (!needArchivesCom.contains(id)) { + needArchivesCom.add(id); + } + }); + } + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(fundCom, billMonth, fundPO.getFundStartTime()); + + List fundComList = new ArrayList<>(); + Map fundComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; + needArchivesCom.stream().forEach(e -> { + InsuranceSchemeDetailPO po = fundCom.get(e); + BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (Objects.equals(po.getPaymentCycle(), 1)) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + fundComJsonMap.put(String.valueOf(e), result.toPlainString()); + fundComList.add(result); + }); + insuranceAccountDetailPO.setFundComJson(JSON.toJSONString(fundComJsonMap)); + BigDecimal fundComSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : fundComList) { + fundComSum = fundComSum.add(bigDecimal); + } + insuranceAccountDetailPO.setFundComSum(fundComSum.toPlainString()); + } + } + return insuranceAccountDetailPO; + } + + + public InsuranceAccountDetailPO accountSocial(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { + boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + if (accountPO.getSocial() != null) { + InsuranceArchivesSocialSchemePO socialPO = accountPO.getSocial(); + insuranceAccountDetailPO.setSocialPayOrg(socialPO.getPaymentOrganization()); + insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount()); + insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId()); + insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString()); + insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString()); + //判断是否在起始缴纳月和最后缴纳月之间 + Boolean inDataRange = SalaryDateUtil.monthInRange(insuranceAccountDetailPO.getBillMonth(), socialPO.getSocialStartTime(), socialPO.getSocialEndTime()); + if ((NonPaymentEnum.YES.getValue().equals(socialPO.getNonPayment()) || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null && inDataRange) { + List detailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(socialPO.getSocialSchemeId()); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); + //方案中包含的需要缴纳社保的个人福利 + int monthIndex = Integer.parseInt(billMonth.split("-")[1]) - 1; + Map schemeperson = detailPOS.stream() + .filter(item -> + Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && + Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_PERSON.getValue()) && + (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1"))) + ) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesPerson = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + //需要核算社保的福利id 个人 + List needArchivesPerson = new ArrayList<>(); + if (archivesPerson != null) { + archivesPerson.forEach((id, value) -> { + if (schemeperson.containsKey(Long.valueOf(id))) { + needArchivesPerson.add(Long.valueOf(id)); + } + }); + } + //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加 + if(schemeperson.size() > 0) { + schemeperson.forEach((id, object) -> { + if (!needArchivesPerson.contains(id)) { + needArchivesPerson.add(id); + } + }); + } + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(schemeperson, billMonth, socialPO.getSocialStartTime()); + + List socialPer = new ArrayList<>(); + Map socialPerJsonMap = new HashMap<>(); + needArchivesPerson.forEach(e -> { + InsuranceSchemeDetailPO po = schemeperson.get(e); + BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (Objects.equals(po.getPaymentCycle(), 1)) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + socialPerJsonMap.put(String.valueOf(e), result.toPlainString()); + socialPer.add(result); + }); + insuranceAccountDetailPO.setSocialPerJson(JSON.toJSONString(socialPerJsonMap)); + BigDecimal socialPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : socialPer) { + socialPerSum = socialPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setSocialPerSum(socialPerSum.toPlainString()); + //方案中包含的需要缴纳社保的单位福利 + Map schemeCom = detailPOS.stream() + .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_COMPANY.getValue()) && + (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1")))) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesCom = new HashMap<>(); + if (welBaseDiffSign) { + archivesCom = JSON.parseObject(socialPO.getSocialPaymentComBaseString(), new HashMap().getClass()); + } else { + archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + } + //需要核算社保的福利id 单位 + List needArchivesCom = new ArrayList<>(); + if (archivesCom != null) { + archivesCom.forEach((id, value) -> { + if (schemeCom.containsKey(Long.valueOf(id))) { + needArchivesCom.add(Long.valueOf(id)); + } + }); + } + //避免福利档案的方案未设置基数，导致核算时遗漏这些福利项的核算，遍历下方案相关福利项，并将遗漏的福利项id添加 + if(schemeCom.size() > 0) { + schemeCom.forEach((id, object) -> { + if (!needArchivesCom.contains(id)) { + needArchivesCom.add(id); + } + }); + } + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(schemeCom, billMonth, socialPO.getSocialStartTime()); + + List socialCom = new ArrayList<>(); + Map sociaComJsonMap = new HashMap<>(); + HashMap finalArchivesCom = archivesCom; + needArchivesCom.stream().forEach(e -> { + InsuranceSchemeDetailPO po = schemeCom.get(e); + BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (Objects.equals(po.getPaymentCycle(), 1)) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + sociaComJsonMap.put(String.valueOf(e), result.toPlainString()); + socialCom.add(result); + + }); + insuranceAccountDetailPO.setSocialComJson(JSON.toJSONString(sociaComJsonMap)); + BigDecimal socialComSum = new BigDecimal("0"); + for (BigDecimal decimal : socialCom) { + socialComSum = socialComSum.add(decimal); + } + insuranceAccountDetailPO.setSocialComSum(socialComSum.toPlainString()); + } + + } + return insuranceAccountDetailPO; + } + + /** + * 对于核算月和福利起始缴纳月处于同年时，要避免根据周期缴纳福利费用时，可能出现的多余费用缴纳情况 + * @param schemeDetail 福利方案明细 + * @param billMonth 核算月 + * @param startMonth 福利起始缴纳月 + * @return + */ + public Map checkCycleSettingWithStartMonth(Map schemeDetail, String billMonth, String startMonth) { + String billYear = billMonth.substring(0,4); + if (StringUtils.isNotBlank(startMonth) && billYear.equals(startMonth.substring(0,4))) { + int startMonthIndex = Integer.parseInt(startMonth.split("-")[1]) - 1; + schemeDetail.forEach((k, v) -> { + if (v.getPaymentCycle() != null && v.getPaymentCycle().equals(1) && startMonthIndex != 0) { + StringBuilder newCycleSetting = new StringBuilder(v.getCycleSetting()); + newCycleSetting.setCharAt(startMonthIndex - 1, '1'); + v.setCycleSetting(newCycleSetting.toString()); + } + }); + + } + return schemeDetail; + } + + private List> splitList(List list, int groupSize) { + int length = list.size(); + // 计算可以分成多少组 + int num = (length + groupSize - 1) / groupSize; + List> newList = new ArrayList<>(num); + for (int i = 0; i < num; i++) { + // 开始位置 + int fromIndex = i * groupSize; + // 结束位置 + int toIndex = (i + 1) * groupSize < length ? (i + 1) * groupSize : length; + newList.add(list.subList(fromIndex, toIndex)); + } + return newList; + } + + /** + * 根据个税扣缴义务人和账单月，获取三类福利档案中符合缴纳开始结束月区间的人员id + * @param paymentOrganization + * @param billMonth + * @return + */ + public List listCanPayEmpIds(Long paymentOrganization, String billMonth) { + List listCanPayEmpIds = new ArrayList<>(); + //社保档案中可进行缴纳的人员 + List socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + //公积金档案中可进行缴纳的人员 + List fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + //其他福利档案中可进行缴纳的人员 + List otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) { + listCanPayEmpIds.addAll(socialCanPayEmpIds); + } + if (fundCanPayEmpIds != null && fundCanPayEmpIds.size() > 0) { + listCanPayEmpIds.addAll(fundCanPayEmpIds); + } + if (otherCanPayEmpIds != null && otherCanPayEmpIds.size() > 0) { + listCanPayEmpIds.addAll(otherCanPayEmpIds); + } + //去重 + listCanPayEmpIds = listCanPayEmpIds.stream().distinct().collect(Collectors.toList()); + return listCanPayEmpIds; + } + + private void handleData(List ids, AccountParam param) { + String billMonth = param.getBillMonth(); + try { + List list = new ArrayList<>(); + List> partitionDetailTempInfo = Lists.partition((List) ids, 100); + partitionDetailTempInfo.forEach(part -> list.addAll( + getSIAccountDetailTempMapper().getListByEmployeeIdsAndBillMonth(part, billMonth, param.getPaymentOrganization()))); + + encryptUtil.decryptList(list, InsuranceAccountDetailTempPO.class); + Integer paymentStatus = 0; + log.info("核算明细临时表 hrsa_bill_detail_temp待处理数量：{}", list.size()); + List> partitionIds = Lists.partition((List) ids, 100); + log.info("bill_detail入库前删除数据数量：{}", ids.size()); + for (List part : partitionIds) { + getInsuranceAccountDetailMapper().batchDelAccountDetails(part, billMonth, param.getPaymentOrganization(), paymentStatus); + + //删除账单月份+个税扣缴义务人+人员id下的调差数据 + getInsuranceCompensationMapper().deleteByBillMonthPayOrgEmpIds(InsuranceCompensationPO.builder() + .billMonth(billMonth) + .paymentOrganization(param.getPaymentOrganization()) + .employeeIds(part) + .build()); + } + + //生成bill_detail入库数据 + List collect = list.stream().map(item -> { + InsuranceAccountDetailPO insuranceAccountDetailPO = new InsuranceAccountDetailPO(); + BeanUtils.copyProperties(item, insuranceAccountDetailPO); + return insuranceAccountDetailPO; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(collect)) { + log.info("bill_detail入库数据数量：{}", collect.size()); + batchSaveAccountInspectDetail(collect); + encryptUtil.encryptList(collect, InsuranceAccountDetailPO.class); + List> lists = splitDetailList(collect, 20); + lists.forEach(subList -> { + getInsuranceAccountDetailMapper().batchSaveAccountDetails(subList); + }); + updateBatchAccount(param); + } + } catch (Exception e) { + log.error("福利核算数据处理失败", e); + getSalaryAcctProgressService(user).fail(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth(), SalaryI18nUtil.getI18nLabel(0, "福利核算出错") + ": " + e.getMessage()); + throw e; + } + } + + public void batchSaveAccountInspectDetail(List list) { + List insuranceAccountInspectAllPOS = accountInspect(list, true); + batchDelInspectDetail(insuranceAccountInspectAllPOS); + List insuranceAccountInspectPOS = accountInspect(list, false); + if (CollectionUtils.isNotEmpty(insuranceAccountInspectPOS)) { + batchSaveInspectDetail(insuranceAccountInspectPOS); + } + } + public void batchDelInspectDetail(List list) { + List> lists = Lists.partition(list, 100); + lists.forEach(getInsuranceAccountInspectMapper()::batchDelInspectDetails); + + } + + public void batchSaveInspectDetail(List list) { + List> lists = Lists.partition(list, 100); + lists.forEach(getInsuranceAccountInspectMapper()::batchSaveInspectDetails); + } + + public List accountInspect(List list, boolean isAll) { + List insuranceAccountInspectPOS = new ArrayList<>(); + for (InsuranceAccountDetailPO e : list) { + if (isAll || detailCheck(e.getSocialPerJson()) || detailCheck(e.getSocialComJson()) + || detailCheck(e.getFundPerJson()) || detailCheck(e.getFundComJson()) + || detailCheck(e.getOtherPerJson()) || detailCheck(e.getOtherComJson())) { + InsuranceAccountInspectPO insuranceAccountInspectPO = InsuranceAccountInspectPO.builder().build(); + insuranceAccountInspectPO.setSupplementaryProjects(e.getSupplementaryProjects()); + insuranceAccountInspectPO.setInspectStatus(InspectStatusEnum.IGNORE.getValue()); + insuranceAccountInspectPO.setBillMonth(e.getBillMonth()); + insuranceAccountInspectPO.setCreator(e.getCreator()); + insuranceAccountInspectPO.setCreateTime(new Date()); + insuranceAccountInspectPO.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + insuranceAccountInspectPO.setEmployeeId(e.getEmployeeId()); + insuranceAccountInspectPO.setPaymentStatus(e.getPaymentStatus()); + insuranceAccountInspectPO.setSupplementaryMonth(e.getSupplementaryMonth()); + insuranceAccountInspectPO.setTenantKey(e.getTenantKey()); + insuranceAccountInspectPO.setUpdateTime(new Date()); + insuranceAccountInspectPOS.add(insuranceAccountInspectPO); + } + } + return insuranceAccountInspectPOS; + } + + public boolean detailCheck(String baseString) { + if (StringUtils.isEmpty(baseString)) { + return false; + } + Map baseStringMap = JSON.parseObject(baseString, new TypeReference>() { + }); + if (baseStringMap == null || baseStringMap.size() == 0) { + return false; + } + return baseStringMap.values().stream().anyMatch(item -> StringUtils.isEmpty(item) || Pattern.matches("^([0].?[0]*)$", item)); + + } + + private List> splitDetailList(List list, int groupSize) { + int length = list.size(); + // 计算可以分成多少组 + int num = (length + groupSize - 1) / groupSize; + List> newList = new ArrayList<>(num); + for (int i = 0; i < num; i++) { + // 开始位置 + int fromIndex = i * groupSize; + // 结束位置 + int toIndex = (i + 1) * groupSize < length ? (i + 1) * groupSize : length; + newList.add(list.subList(fromIndex, toIndex)); + } + return newList; + } + + /** + * 更新台账接口 + */ + public void updateBatchAccount(AccountParam param) { + String billMonth = param.getBillMonth(); + + List insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().selectList(billMonth, param.getPaymentOrganization()); + Map> map = insuranceAccountDetailPOS.stream().filter(item -> item.getEmployeeId() != null) + .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getEmployeeId)); + int socialAccountPerson = 0; + int funcAccountPerson = 0; + int otherAccountPerson = 0; + BigDecimal socialSum = new BigDecimal("0"); + BigDecimal fundSum = new BigDecimal("0"); + BigDecimal otherSum = new BigDecimal("0"); + for (Map.Entry> entry : map.entrySet()) { + List v = entry.getValue(); + BigDecimal socialTemp = new BigDecimal("0"); + BigDecimal fundTemp = new BigDecimal("0"); + BigDecimal otherTemp = new BigDecimal("0"); + encryptUtil.decryptList(v, InsuranceAccountDetailPO.class); + boolean socialPersonFlag = false; + boolean fundPersonFlag = false; + boolean otherPersonFlag = false; + for (InsuranceAccountDetailPO item : v) { + // 判断社保是否为0 + socialPersonFlag = (StringUtils.isBlank(item.getSocialSum()) || SalaryEntityUtil.StringEqZERO(item.getSocialSum())); + BigDecimal socialPerson = socialPersonFlag ? new BigDecimal("0") : new BigDecimal(item.getSocialSum()); + fundPersonFlag = (StringUtils.isBlank(item.getFundSum()) || SalaryEntityUtil.StringEqZERO(item.getFundSum())); + BigDecimal fundPerson = fundPersonFlag ? new BigDecimal("0") : new BigDecimal(item.getFundSum()); + otherPersonFlag = (StringUtils.isBlank(item.getOtherSum()) || SalaryEntityUtil.StringEqZERO(item.getOtherSum())); + BigDecimal otherPerson = otherPersonFlag ? new BigDecimal("0") : new BigDecimal(item.getOtherSum()); + socialTemp = socialTemp.add(socialPerson); + fundTemp = fundTemp.add(fundPerson); + otherTemp = otherTemp.add(otherPerson); + if (!socialPersonFlag && !item.getPaymentStatus().equals(PaymentStatusEnum.BALANCE.getValue())) { + socialAccountPerson += 1; + } + if (!fundPersonFlag && !item.getPaymentStatus().equals(PaymentStatusEnum.BALANCE.getValue())) { + funcAccountPerson += 1; + } + if (!otherPersonFlag && !item.getPaymentStatus().equals(PaymentStatusEnum.BALANCE.getValue())) { + otherAccountPerson += 1; + } + } + + if (!"0".equals(socialTemp.toPlainString())) { + socialSum = socialSum.add(socialTemp); + } + if (!"0".equals(fundTemp.toPlainString())) { + fundSum = fundSum.add(fundTemp); + } + if (!"0".equals(otherTemp.toPlainString())) { + otherSum = otherSum.add(otherTemp); + } + } + InsuranceAccountBatchPO insuranceAccountBatchPO = getInsuranceAccountBatchMapper().getByBillMonth(billMonth, param.getPaymentOrganization()); + encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); + + insuranceAccountBatchPO.setAccountant(user.getLastname()); + insuranceAccountBatchPO.setUpdateTime(new Date()); + insuranceAccountBatchPO.setSocialPay(socialSum.toPlainString()); + insuranceAccountBatchPO.setSocialNum(socialAccountPerson); + insuranceAccountBatchPO.setFundNum(funcAccountPerson); + insuranceAccountBatchPO.setFundPay(fundSum.toPlainString()); + insuranceAccountBatchPO.setOtherNum(otherAccountPerson); + insuranceAccountBatchPO.setOtherPay(otherSum.toPlainString()); + encryptUtil.encrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); + getInsuranceAccountBatchMapper().updateById(insuranceAccountBatchPO); +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetId(String.valueOf(insuranceAccountBatchPO.getId())); +// insuranceSchemeContext.setTargetName(insuranceAccountBatchPO.getBillMonth()); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100491, "更新台账")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100491, "更新台账")); +// insuranceSchemeContext.setNewValues(insuranceAccountBatchPO); +// siAccountLoggerTemplate.write(insuranceSchemeContext); + + } + + public void siFile(String billMonth, Long paymentOrganization) { + + //开始归档数据 + InsuranceAccountBatchPO insuranceAccountBatchPO = getInsuranceAccountBatchMapper().getByBillStatus(billMonth, BillStatusEnum.NOT_ARCHIVED.getValue(), paymentOrganization); + encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); + SalaryAssert.notNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(0, "月份账单不存在")); + SalaryAssert.isFalse(Objects.equals(insuranceAccountBatchPO.getBillStatus(), BillStatusEnum.ARCHIVED.getValue()), SalaryI18nUtil.getI18nLabel(0, "月份账单已归档")); + insuranceAccountBatchPO.setBillStatus(BillStatusEnum.ARCHIVED.getValue()); + encryptUtil.encrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); + getInsuranceAccountBatchMapper().updateById(insuranceAccountBatchPO); + //日志记录 +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetId(String.valueOf(insuranceAccountBatchPO.getId())); +// insuranceSchemeContext.setTargetName(insuranceAccountBatchPO.getBillMonth()); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100506, "台账归档")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100506, "台账归档")); +// insuranceSchemeContext.setNewValues(insuranceAccountBatchPO); +// siAccountLoggerTemplate.write(insuranceSchemeContext); + } } diff --git a/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java b/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java new file mode 100644 index 000000000..7d1b8f757 --- /dev/null +++ b/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java @@ -0,0 +1,107 @@ +package com.engine.salary.timer; + +import cn.hutool.core.util.StrUtil; +import com.engine.common.util.ServiceUtil; +import com.engine.salary.common.SalaryContext; +import com.engine.salary.entity.siaccount.param.AccountParam; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.formlua.util.RegularUtil; +import com.engine.salary.service.SIAccountService; +import com.engine.salary.service.TaxAgentService; +import com.engine.salary.service.impl.SIAccountServiceImpl; +import com.engine.salary.service.impl.TaxAgentServiceImpl; +import lombok.extern.slf4j.Slf4j; +import weaver.hrm.User; +import weaver.interfaces.schedule.BaseCronJob; + +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Calendar; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 福利台账核算并归档任务 + * @Date: 2024/1/15 + **/ +@Slf4j +public class AutoSiAccountAndFileJob extends BaseCronJob { + + private String diffToCurrentMonth; + + public String getDiffToCurrentMonth() { + return diffToCurrentMonth; + } + + public void setDiffToCurrentMonth(String diffToCurrentMonth) { + this.diffToCurrentMonth = diffToCurrentMonth; + } + + private String taxAgentNames; + + public String getTaxAgentNames() { + return taxAgentNames; + } + + public void setTaxAgentNames(String taxAgentNames) { + this.taxAgentNames = taxAgentNames; + } + + private String fileFlag; + + public String getFileFlag() { + return fileFlag; + } + + public void setFileFlag(String fileFlag) { + this.fileFlag = fileFlag; + } + + private TaxAgentService getTaxAgentService(User user) { + SalaryContext.get().setValue("user",user); + return ServiceUtil.getService(TaxAgentServiceImpl.class, user); + } + + public SIAccountService getSIAccountService(User user) { + SalaryContext.get().setValue("user",user); + return ServiceUtil.getService(SIAccountServiceImpl.class, user); + } + + @Override + public void execute() { + if (StrUtil.isNotBlank(diffToCurrentMonth) && RegularUtil.isInteger(diffToCurrentMonth)) { + User user = new User(); + user.setUid(1); + user.setLoginid("sysadmin"); + user.setLastname("sysadmin"); + + Calendar accountTime= Calendar.getInstance(); +// prevMonth.setTimeInMillis(System.currentTimeMillis()); + accountTime.set(Calendar.MONTH, accountTime.get(Calendar.MONTH) + Integer.parseInt(diffToCurrentMonth)); + SimpleDateFormat s=new SimpleDateFormat("yyyy-MM"); + + String accountMonth = s.format(accountTime.getTime()); + boolean isFile = false; + if (StrUtil.isNotBlank(fileFlag) && "true".equals(fileFlag)) { + isFile = true; + } + //核算并归档 + List taxAgentList = getTaxAgentService(user).listAll(); + //判断是否过滤个税扣缴义务人 + if (StrUtil.isNotBlank(taxAgentNames)) { + List taxAgentNameList = Arrays.stream(taxAgentNames.split(",")).map(String::new).collect(Collectors.toList()); + taxAgentList = taxAgentList.stream().filter(f -> taxAgentNameList.contains(f.getName())).collect(Collectors.toList()); + } + for (TaxAgentPO po : taxAgentList) { + try { + getSIAccountService(user).saveAndFile(AccountParam.builder().paymentOrganization(po.getId()).billMonth(accountMonth).flag(true).fileFlag(isFile).build()); + } catch (Exception e) { + log.info("个税扣缴义务人-" + po.getName() + "，新建账单月份" + accountMonth + "的福利核算（并归档）过程失败，原因：" + e.getMessage()); + } + } + + } + + } +} From 40013d698bb891dbe936170ad3f423a5b4acc714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 18 Jan 2024 15:12:00 +0800 Subject: [PATCH 048/169] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SalaryStatisticsReportServiceImpl.java | 118 ++++++++++++++---- .../SalaryStatisticsDimensionWrapper.java | 3 +- .../SalaryStatisticsReportWrapper.java | 14 +-- 3 files changed, 104 insertions(+), 31 deletions(-) diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 3f9745f11..65a672424 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -495,12 +495,11 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary String salaryReportConditions = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id); if (StringUtils.isNotBlank(salaryReportConditions)) { Arrays.asList(salaryReportConditions.split(",")).forEach(paramMd5 -> { - if (StringUtils.isNotBlank(paramMd5)) { - //条件对应的结果 - getSalaryCacheService(user).remove(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); - } - } - ); + if (StringUtils.isNotBlank(paramMd5)) { + //条件对应的结果 + getSalaryCacheService(user).remove(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); + } + }); getSalaryCacheService(user).remove(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id); } } @@ -523,14 +522,13 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary List c = new ArrayList<>(); if (StringUtils.isNotBlank(salaryReportConditions)) { Arrays.asList(salaryReportConditions.split(",")).forEach(paramMd5 -> { - if (StringUtils.isNotBlank(paramMd5)) { - Map data = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5); - Map kv = new HashMap<>(); - kv.put(paramMd5, data); - c.add(kv); - } - } - ); + if (StringUtils.isNotBlank(paramMd5)) { + Map data = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5); + Map kv = new HashMap<>(); + kv.put(paramMd5, data); + c.add(kv); + } + }); report.add(c); } } @@ -639,7 +637,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary case SalaryStatisticsDimensionConstant.DM_COMPANY_YEAR: return buildCompanyYearRecords(data, salaryAcctResultValueMap); default: - return new PageInfo<>(); + return buildSalaryItemRecords(data, dimension.getDimCode(), salaryAcctResultValueMap); } // 定量-组距式分组 } else if (SalaryStatisticsDimensionTypeEnum.RATION_GROUP_SPACING.getValue().equals(dimension.getDimType())) { @@ -1063,9 +1061,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary Map> sameEmployeeListMap = data.getSameList().stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId)); List empIds = accountDetailPOList.stream().map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList()); - Map employeeByIdMap = getSalaryEmployeeService(user).getEmployeeByIdsAll(empIds) - .stream() - .collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, o -> o)); + Map employeeByIdMap = getSalaryEmployeeService(user).getEmployeeByIdsAll(empIds).stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, o -> o)); //人员维度扩展属性 EmployeeInfoExpandDTO employeeInfoExpandDTO = getSalaryStatisticsDimensionService(user).getExpandFieldSettings("dim_employee"); @@ -1083,11 +1079,9 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary Map temp = new HashMap<>(); // temp.put(DM, Objects.nonNull(employeeByIdMap.get(k)) ? employeeByIdMap.get(k) : employeeExtByIdMap.get(k)); temp.put(DM, employeeByIdMap.get(k).getUsername()); - fieldSettings.forEach( - fieldSetting -> { - temp.put(fieldSetting.getField(), expandEmployeeMap.getOrDefault(k, new HashMap<>()).get(fieldSetting.getField())); - } - ); + fieldSettings.forEach(fieldSetting -> { + temp.put(fieldSetting.getField(), expandEmployeeMap.getOrDefault(k, new HashMap<>()).get(fieldSetting.getField())); + }); temp.putAll(SalaryStatisticsReportBO.calculateItem(v, lastEmployeeListMap.get(k), sameEmployeeListMap.get(k), salaryAcctResultValueMap, data.getSalaryStatisticsItemList())); records.add(temp); } else if (StringUtils.equals(dimensionValue, employeeByIdMap.get(k).getUsername())) { @@ -1926,6 +1920,84 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary return result; } + private PageInfo> buildSalaryItemRecords(SalaryStatisticsReportDataDTO data, String dimCode, Map> salaryAcctResultValueMap) { + + //查询薪资项目存在的种类 + Set itemValues = new HashSet<>(); + for (Long k : salaryAcctResultValueMap.keySet()) { + Map map = salaryAcctResultValueMap.get(k); + itemValues.add(map.getOrDefault(dimCode, "")); + } + + + PageInfo> result = new PageInfo<>(); + List> records = new ArrayList<>(); + Map> simpleUserInfoMap = getSimpleUserInfoList(data); + if (simpleUserInfoMap.isEmpty()) { + return result; + } + + + Set companyYearSet = new HashSet<>(); + + Map empIdCompanyYearMap = new HashMap<>(); + Map lastEmpIdCompanyYearMap = new HashMap<>(); + Map sameEmpIdCompanyYearMap = new HashMap<>(); + simpleUserInfoMap.get(NOW_INFO).forEach(employee -> { + if (employee.getCompanyWorkYear() != null) { + companyYearSet.add(Util.null2String(employee.getCompanyWorkYear())); + empIdCompanyYearMap.put(employee.getEmployeeId(), Util.null2String(employee.getCompanyWorkYear())); + } + }); + simpleUserInfoMap.get(LAST_INFO).forEach(employee -> { + if (employee.getCompanyWorkYear() != null) { + lastEmpIdCompanyYearMap.put(employee.getEmployeeId(), Util.null2String(employee.getCompanyWorkYear())); + } + }); + simpleUserInfoMap.get(SAME_INFO).forEach(employee -> { + if (employee.getCompanyWorkYear() != null) { + sameEmpIdCompanyYearMap.put(employee.getEmployeeId(), Util.null2String(employee.getCompanyWorkYear())); + } + }); + + List companyYears = Lists.newArrayList(companyYearSet); + companyYears = companyYears.stream().sorted().collect(Collectors.toList()); + + String dimensionValue = data.getDimensionValue(); + companyYears.forEach(k -> { + if (dimensionValue == null) { + List salaryAcctEmployees = data.getList().stream().filter(po -> Objects.equals(empIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); + List lastSalaryAcctEmployees = data.getLastList().stream().filter(po -> Objects.equals(lastEmpIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); + List sameSalaryAcctEmployees = data.getSameList().stream().filter(po -> Objects.equals(sameEmpIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); + Map temp = new HashMap<>(); + temp.put(DM, k); + temp.putAll(SalaryStatisticsReportBO.calculateItem(salaryAcctEmployees, lastSalaryAcctEmployees, sameSalaryAcctEmployees, salaryAcctResultValueMap, data.getSalaryStatisticsItemList())); + records.add(temp); + } else if (StringUtils.equals(dimensionValue, k)) { + List salaryAcctEmployees = data.getList().stream().filter(po -> Objects.equals(empIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); + data.setListByDimensionValue(salaryAcctEmployees); + } + }); + + if (dimensionValue == null) { + List noGroupingList = data.getList().stream().filter(po -> empIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); + List lastNoGroupingList = data.getLastList().stream().filter(po -> lastEmpIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); + List sameNoGroupingList = data.getSameList().stream().filter(po -> sameEmpIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(noGroupingList)) { + Map noGrouping = new HashMap<>(); + noGrouping.put(DM, SalaryI18nUtil.getI18nLabel(153462, "无分组")); + noGrouping.putAll(SalaryStatisticsReportBO.calculateItem(noGroupingList, lastNoGroupingList, sameNoGroupingList, salaryAcctResultValueMap, data.getSalaryStatisticsItemList())); + records.add(noGrouping); + } + } else if (StringUtils.equals(dimensionValue, "无分组")) { + List noGroupingList = data.getList().stream().filter(po -> empIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); + data.setListByDimensionValue(noGroupingList); + } + + result.setList(records); + return result; + } + // private PageInfo> buildRationGroupSpacing4NoItemRecords(SalaryStatisticsDimensionPO dimension, SalaryStatisticsReportDataDTO data, Map> salaryAcctResultValueMap) { // PageInfo> result = new PageInfo<>(); // List> records = new ArrayList<>(); diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java index 7e8c8a374..70261fc4d 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java @@ -114,6 +114,7 @@ public class SalaryStatisticsDimensionWrapper extends Service { * @return */ public SalaryStatisticsDimensionFormDTO getFrom(Long id) { + List salaryItemList = salaryItemService(user).listAll(); List statsDimOptions = Lists.newArrayList(); // statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_SEX, SalaryI18nUtil.getI18nLabel(98622, "性别"))); @@ -129,12 +130,12 @@ public class SalaryStatisticsDimensionWrapper extends Service { // statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_AGE, SalaryI18nUtil.getI18nLabel(174001, "年龄"))); statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_WORK_YEAR, SalaryI18nUtil.getI18nLabel(174000, "工龄"))); statsDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_COMPANY_YEAR, SalaryI18nUtil.getI18nLabel(174003, "司龄"))); + statsDimOptions.addAll(salaryItemList.stream().map(item -> new WeaFormOption(item.getId().toString(), item.getName())).collect(Collectors.toList())); List groupDimOptions = Lists.newArrayList(); // groupDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_AGE, SalaryI18nUtil.getI18nLabel(174001, "年龄"))); groupDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_WORK_YEAR, SalaryI18nUtil.getI18nLabel(174000, "工龄"))); groupDimOptions.add(new WeaFormOption(SalaryStatisticsDimensionConstant.DM_COMPANY_YEAR, SalaryI18nUtil.getI18nLabel(174003, "司龄"))); - List salaryItemList = salaryItemService(user).listAll(); groupDimOptions.addAll(salaryItemList.stream() .filter(item -> SalaryDataTypeEnum.NUMBER.getValue().equals(item.getDataType())) .map(item -> new WeaFormOption(item.getId().toString(), item.getName())).collect(Collectors.toList())); diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java index 508877028..0da317ee9 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java @@ -319,13 +319,13 @@ public class SalaryStatisticsReportWrapper extends Service { //已缓存的报表id String salaryReportIds = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_IDS)); String salaryReportConditions = ""; - 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)) { - return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); - } - } +// 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)) { +// return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); +// } +// } // 列表data From f236b8e655da64dacb98662097419a93f861b846 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 19 Jan 2024 11:35:11 +0800 Subject: [PATCH 049/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95=E6=A2=B3=E7=90=86=E5=92=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/SIAccountService.java | 2 + .../service/impl/SIAccountServiceImpl.java | 935 +++++++++++++++++- .../service/impl/SIExportServiceImpl.java | 6 +- .../salary/timer/AutoSiAccountAndFileJob.java | 1 - .../engine/salary/web/SIExportController.java | 13 +- 5 files changed, 918 insertions(+), 39 deletions(-) diff --git a/src/com/engine/salary/service/SIAccountService.java b/src/com/engine/salary/service/SIAccountService.java index 60d06ed86..6a496845b 100644 --- a/src/com/engine/salary/service/SIAccountService.java +++ b/src/com/engine/salary/service/SIAccountService.java @@ -314,5 +314,7 @@ public interface SIAccountService { boolean checkBalance(InsuranceAccountDetailPO po); boolean checkBalancePayInsurance(InsuranceAccountDetailPO po); + + List buildRecords(List list, Map paymentMap); } diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 6bb0fd1f2..43168124a 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -18,10 +18,7 @@ import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.progress.ProgressDTO; import com.engine.salary.entity.siaccount.bo.InsuranceAccountBO; -import com.engine.salary.entity.siaccount.dto.InsuranceAccountBatchListDTO; -import com.engine.salary.entity.siaccount.dto.InsuranceAccountTabDTO; -import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; -import com.engine.salary.entity.siaccount.dto.InsuranceAcctDetailImportFieldDTO; +import com.engine.salary.entity.siaccount.dto.*; import com.engine.salary.entity.siaccount.param.*; import com.engine.salary.entity.siaccount.po.*; import com.engine.salary.entity.siarchives.po.*; @@ -67,6 +64,7 @@ import com.engine.salary.util.valid.ValidUtil; import com.engine.salary.wrapper.SalaryFormulaWrapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.wbi.util.StringUtil; import dm.jdbc.util.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -83,6 +81,7 @@ import weaver.hrm.User; import java.io.InputStream; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -103,7 +102,6 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; @Slf4j public class SIAccountServiceImpl extends Service implements SIAccountService { -// private SIAccountBiz siAccountBiz = new SIAccountBiz(); private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); @@ -113,9 +111,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return ServiceUtil.getService(RecordsBuildServiceImpl.class, user); } - public SIAccountBiz getSiAccountBiz(User user) { - return ServiceUtil.getService(SIAccountBiz.class, user); - } +// public SIAccountBiz getSiAccountBiz(User user) { +// return ServiceUtil.getService(SIAccountBiz.class, user); +// } public ColumnBuildService getColumnBuildService(User user) { return ServiceUtil.getService(ColumnBuildServiceImpl.class, user); @@ -225,6 +223,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return MapperProxyFactory.getProxy(InsuranceCompensationMapper.class); } + private SIAccountUtilMapper getSIAccountUtilMapper() { + return MapperProxyFactory.getProxy(SIAccountUtilMapper.class); + } + @Override public Map listPage(InsuranceAccountBatchParam queryParam) { Long employeeId = (long) user.getUID(); @@ -244,7 +246,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } //福利台账列表 - PageInfo pageInfo = getSiAccountBiz(user).listPage(queryParam); +// PageInfo pageInfo = getSiAccountBiz(user).listPage(queryParam); + PageInfo pageInfo = siBatchListPage(queryParam); Collection insuranceAccountBatchPOS = pageInfo.getList(); List insuranceAccountBatchListDTOS = InsuranceAccountBO.buildAccountBatchDTOList(insuranceAccountBatchPOS); @@ -313,7 +316,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { Map datas = new HashMap<>(); //正常缴纳列表 - PageInfo pageInfo = getSiAccountBiz(user).listCommonPage(queryParam); +// PageInfo pageInfo = getSiAccountBiz(user).listCommonPage(queryParam); + PageInfo pageInfo = siBatchListCommonPage(queryParam); List insuranceAccountDetailPOS = pageInfo.getList(); //数据组装 @@ -599,7 +603,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public void delete(AccountParam accountParam) { Long employeeId = (long) user.getUID(); - getSiAccountBiz(user).delete(accountParam, employeeId); +// getSiAccountBiz(user).delete(accountParam, employeeId); + siDelete(accountParam); } @Override @@ -635,24 +640,27 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { public void saveSupplementaryAccount(SaveSupplementaryAccountParam saveSupplementaryAccountParam) { ValidUtil.doValidator(saveSupplementaryAccountParam); - Long employeeId = (long) user.getUID(); - String currentUserName = user.getLastname(); - getSiAccountBiz(user).saveSupplementaryAccount(saveSupplementaryAccountParam, employeeId, currentUserName); +// Long employeeId = (long) user.getUID(); +// String currentUserName = user.getLastname(); +// getSiAccountBiz(user).saveSupplementaryAccount(saveSupplementaryAccountParam, employeeId, currentUserName); + siSaveSupplementaryAccount(saveSupplementaryAccountParam); } @Override public void deleteCommonAccount(SaveCommonAccountParam param) { ValidUtil.doValidator(param); - Long employeeId = (long) user.getUID(); - String currentUserName = user.getLastname(); - getSiAccountBiz(user).deleteCommonAccount(param, employeeId, currentUserName); +// Long employeeId = (long) user.getUID(); +// String currentUserName = user.getLastname(); +// getSiAccountBiz(user).deleteCommonAccount(param, employeeId, currentUserName); + siDeleteCommonAccount(param); } @Override public void deleteSummplementaryAccount(List supplementAccountBaseParams) { - Long employeeId = (long) user.getUID(); - String currentUserName = user.getLastname(); - getSiAccountBiz(user).deleteSupplementaryAccount(supplementAccountBaseParams, employeeId, currentUserName); +// Long employeeId = (long) user.getUID(); +// String currentUserName = user.getLastname(); +// getSiAccountBiz(user).deleteSupplementaryAccount(supplementAccountBaseParams, employeeId, currentUserName); + siDeleteSupplementaryAccount(supplementAccountBaseParams); } @Override @@ -799,10 +807,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public void accountInspect(InspectAccountParam param) { - Long employeeId = (long) user.getUID(); +// Long employeeId = (long) user.getUID(); ValidUtil.doValidator(param); - String currentUserName = user.getLastname(); - getSiAccountBiz(user).accountInspect(param.getIds(), param.getBillMonth(), employeeId, currentUserName, param.getPaymentOrganization()); +// String currentUserName = user.getLastname(); +// getSiAccountBiz(user).accountInspect(param.getIds(), param.getBillMonth(), employeeId, currentUserName, param.getPaymentOrganization()); + accountInspect(param.getIds(), param.getBillMonth(), param.getPaymentOrganization()); } @Override @@ -926,7 +935,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public PageInfo overView(InsuranceAccountDetailParam queryParam) { - PageInfo pageInfos = getSiAccountBiz(user).overView(queryParam); +// PageInfo pageInfos = getSiAccountBiz(user).overView(queryParam); + PageInfo pageInfos = siOverView(queryParam); return pageInfos; } @@ -1521,13 +1531,15 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { @Override public void socialSecurityBenefitsRecalculate(InsuranceAccountBatchPO param) { //fixme 重新核算的校验逻辑 1、先取台账对应扣缴义务人下的所有账套 2、取账套下所有核算记录 3、判断核算记录有没有使用对应月份的福利台账 - int num = getSiAccountBiz(user).checkIfBusinessaccounting(param); +// int num = getSiAccountBiz(user).checkIfBusinessaccounting(param); + int num = checkIfBusinessAccounting(param); //表示已经被核算过不能重新核算 if (num > 0) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "已被薪酬核算给核算过，无法重新核算！")); } param.setBillStatus(0); - getSiAccountBiz(user).updateById(param); +// getSiAccountBiz(user).updateById(param); + updateById(param); } /** @@ -1804,7 +1816,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { encryptUtil.encryptList(updateInsuranceAccountDetailList, InsuranceAccountDetailPO.class); //更新 for(InsuranceAccountDetailPO po : updateInsuranceAccountDetailList) { - getSiAccountBiz(user).updateByEmployeeIdAndBillMonth(po); +// getSiAccountBiz(user).updateByEmployeeIdAndBillMonth(po); + updateByEmployeeIdAndBillMonth(po); } //刷新hrsa_bill_batch中数据统计信息 @@ -3667,7 +3680,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { encryptUtil.encryptList(updateInsuranceAccountDetailList, InsuranceAccountDetailPO.class); //更新 for(InsuranceAccountDetailPO po : updateInsuranceAccountDetailList) { - getSiAccountBiz(user).updateByEmployeeIdAndBillMonth(po); +// getSiAccountBiz(user).updateByEmployeeIdAndBillMonth(po); + updateByEmployeeIdAndBillMonth(po); } } if (createInsuranceAccountDetailList.size() > 0) { @@ -3705,7 +3719,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // 正常缴纳列表 queryParam.setPageSize(10000000); - PageInfo pageInfo = getSiAccountBiz(user).listCommonPage(queryParam); +// PageInfo pageInfo = getSiAccountBiz(user).listCommonPage(queryParam); + PageInfo pageInfo = siBatchListCommonPage(queryParam); List insuranceAccountDetailPOS = pageInfo.getList(); // 数据组装 List> records = getService(user).buildCommonRecords(insuranceAccountDetailPOS, employeeId); @@ -4319,6 +4334,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { insuranceAccountDetailPO.setOtherComSum(otherComSum.toPlainString()); return insuranceAccountDetailPO; } + /*****以下代码为SIAccountBiz中逻辑迁移，旨在减少Biz类的使用*****/ /** * 新建核算并归档 @@ -5352,4 +5368,865 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // insuranceSchemeContext.setNewValues(insuranceAccountBatchPO); // siAccountLoggerTemplate.write(insuranceSchemeContext); } + + + public PageInfo siBatchListPage(InsuranceAccountBatchParam queryParam) { + List list = getInsuranceAccountBatchMapper().list(queryParam); + PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), + list, InsuranceAccountBatchPO.class); + encryptUtil.decryptList(page.getList(), InsuranceAccountBatchPO.class); + return page; + } + + public PageInfo siBatchListCommonPage(InsuranceAccountDetailParam queryParam) { + queryParam.setPaymentStatus(PaymentStatusEnum.COMMON.getValue()); + //排序配置 + OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); + queryParam.setOrderRule(orderRule); + //系统人员福利台账明细 + List list = getInsuranceAccountDetailMapper().list(queryParam); + //非系统各人员台账明细 + List extList = getInsuranceAccountDetailMapper().extList(queryParam); + list.addAll(extList); + PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), + list, InsuranceAccountDetailPO.class); + encryptUtil.decryptList(pageInfo.getList(), InsuranceAccountDetailPO.class); + return pageInfo; + } + + public void siDelete(AccountParam param) { + InsuranceAccountBatchPO insuranceAccountBatchPO = getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), param.getPaymentOrganization()); + encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); + SalaryAssert.notNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(0, "参数错误")); +// if (insuranceAccountBatchPO.getBillStatus().equals(BillStatusEnum.ARCHIVED.getValue())) { +// int num = checkIfBusinessAccounting(insuranceAccountBatchPO); +// //表示已经被核算过不能重新核算 +// if (num > 0) { +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "已被薪酬核算给核算过，无法删除！")); +// } +// } + +// if(param.getPaymentOrganization()==null){ +// throw new SalaryRunTimeException("个税扣缴义务人为空"); +// } + getInsuranceAccountBatchMapper().deleteById(insuranceAccountBatchPO.getId()); + getInsuranceAccountDetailMapper().batchDeleteNotFile(param.getBillMonth(), param.getPaymentOrganization()); + + //删除账单月份+个税扣缴义务人下的调差数据 + getInsuranceCompensationMapper().deleteByBillMonthAndPayOrg(param.getBillMonth(), param.getPaymentOrganization()); +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetId(String.valueOf(insuranceAccountBatchPO.getId())); +// insuranceSchemeContext.setTargetName(insuranceAccountBatchPO.getBillMonth()); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.DELETE.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantkey, employeeId, 100464, "删除台账")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantkey, employeeId, 100464, "删除台账")); +// insuranceSchemeContext.setNewValues(insuranceAccountBatchPO); +// siAccountLoggerTemplate.write(insuranceSchemeContext); + } + + public void siSaveSupplementaryAccount(SaveSupplementaryAccountParam param) { + if (StringUtils.isBlank(param.getBillMonth()) || CollectionUtils.isEmpty(param.getBillMonthList()) || CollectionUtils.isEmpty(param.getProjects()) + || CollectionUtils.isEmpty(param.getIncludes())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "参数错误")); + } + //需要补缴的月份 + if (param.getBillMonthList().contains(param.getBillMonth())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "当前月走正常缴纳")); + } + //需要补缴的员工id + List employeeIds = param.getIncludes(); + if (CollectionUtils.isNotEmpty(param.getExcludes())) { + employeeIds = employeeIds.stream().filter(item -> !param.getExcludes().contains(item)).collect(Collectors.toList()); + } + //校验补缴人员是否存在福利档案基础信息，并且runStatus处于正在缴纳或者待减员 + List insuranceBaseInfoList = getInsuranceBaseInfoMapper().getSocialByPaymentOrganization(param.getPaymentOrganization()); + List finalEmployeeIds = employeeIds; + List filterList = insuranceBaseInfoList.stream().filter(e -> { + for (Long uId : finalEmployeeIds) { + if (e.getEmployeeId().equals(uId) && (e.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue()) || e.getRunStatus().equals(EmployeeStatusEnum.PAYING.getValue()))) { + return true; + } + } + return false; + }).collect(Collectors.toList()); + if (filterList.size() != employeeIds.size()) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "补缴人员中存在未设置福利档案人员或相关人员不在福利在缴人员中，不可新建补缴信息！")); + } + //20231122逻辑优化，过滤出不在起始缴纳月和最后缴纳月区间的人员 + List empIdsInPayMonthRange = listCanPayEmpIds(param.getPaymentOrganization(), param.getBillMonth()); + employeeIds = employeeIds.stream().filter(f -> empIdsInPayMonthRange.contains(f)).collect(Collectors.toList()); + + SalaryAssert.notEmpty(employeeIds, SalaryI18nUtil.getI18nLabel(0, "无核算人员")); + List baseList = new ArrayList<>(); + employeeIds.stream().forEach(id -> { + param.getBillMonthList().stream().forEach(month -> { + SupplementAccountBaseParam supplementAccountBaseParam = SupplementAccountBaseParam.builder() + .supplementaryMonth(month) + .employeeId(id) + .paymentOrganization(param.getPaymentOrganization()) + .projects(param.getProjects()) + .billMonth(param.getBillMonth()) + .supplementType(param.getSupplementType()) + .build(); + if ("2".equals(param.getSupplementType())) { + supplementAccountBaseParam.setSocialPaymentBaseString(param.getSocialPaymentBaseString()); + supplementAccountBaseParam.setFundPaymentBaseString(param.getFundPaymentBaseString()); + supplementAccountBaseParam.setOtherPaymentBaseString(param.getOtherPaymentBaseString()); + } else if("3".equals(param.getSupplementType())) { + supplementAccountBaseParam.setSocialPaymentPerString(param.getSocialPaymentPerString()); + supplementAccountBaseParam.setSocialPaymentComString(param.getSocialPaymentComString()); + supplementAccountBaseParam.setFundPaymentPerString(param.getFundPaymentPerString()); + supplementAccountBaseParam.setFundPaymentComString(param.getFundPaymentComString()); + supplementAccountBaseParam.setOtherPaymentPerString(param.getOtherPaymentPerString()); + supplementAccountBaseParam.setOtherPaymentComString(param.getOtherPaymentComString()); + } + baseList.add(supplementAccountBaseParam); + }); + }); + //核算开始 + accountSupplement(baseList, employeeIds, param.getPaymentOrganization()); + + updateBatchAccount(AccountParam.builder().billMonth(param.getBillMonth()).paymentOrganization(param.getPaymentOrganization()).build()); + } + + /** + * @param baseList 员工id-账单月份-补缴月份（单挑）-补缴项 集合 + * @param employeeIds 需要补缴的员工id + * @return + */ + public String accountSupplement(List baseList, List employeeIds, Long paymentOrganization) { + //(k,v) k-员工id v-员工对应的福利档案数据 + Map longInsuranceArchivesAccountPOMap = siArchivesBiz.buildBatchAccount(employeeIds, paymentOrganization); + //核算结果集 + List pos = new ArrayList<>(); + baseList.forEach(baseParam -> { + //判断人员id+账单月份+补缴月份在表中的唯一性 + List supplementList = getInsuranceAccountDetailMapper().querySupplementList(baseParam.getBillMonth(), baseParam.getPaymentOrganization(), baseParam.getEmployeeId(), baseParam.getSupplementaryMonth()); + if (supplementList.size() > 0) { + throw new SalaryRunTimeException("当前人员和账单月份已存在该补缴月份的数据！无法再次创建！"); + } + InsuranceAccountDetailPO insuranceAccountDetailPO = accountSingleEmployeeBill(baseParam, longInsuranceArchivesAccountPOMap.get(baseParam.getEmployeeId())); + pos.add(insuranceAccountDetailPO); + }); + batchSaveSupplementAccount(pos); + return SalaryI18nUtil.getI18nLabel(0, "核算完成,数据保存成功"); + } + + public InsuranceAccountDetailPO accountSingleEmployeeBill(SupplementAccountBaseParam baseParam, InsuranceArchivesAccountPO accountPO) { + InsuranceAccountDetailPO insuranceAccountDetailPO = new InsuranceAccountDetailPO(); + List projects = baseParam.getProjects(); + insuranceAccountDetailPO.setBillMonth(baseParam.getBillMonth()); + insuranceAccountDetailPO.setBillStatus(BillStatusEnum.NOT_ARCHIVED.getValue()); + insuranceAccountDetailPO.setCreator((long) user.getUID()); + insuranceAccountDetailPO.setCreateTime(new Date()); + insuranceAccountDetailPO.setUpdateTime(new Date()); + insuranceAccountDetailPO.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + insuranceAccountDetailPO.setId(IdGenerator.generate()); + insuranceAccountDetailPO.setEmployeeId(baseParam.getEmployeeId()); + insuranceAccountDetailPO.setPaymentStatus(PaymentStatusEnum.REPAIR.getValue()); + insuranceAccountDetailPO.setSupplementaryMonth(baseParam.getSupplementaryMonth()); + insuranceAccountDetailPO.setPaymentOrganization(baseParam.getPaymentOrganization()); + insuranceAccountDetailPO.setSupplementaryProjects( + String.join(",", + baseParam.getProjects() == null ? new ArrayList<>() : baseParam.getProjects().stream().map(String::valueOf).collect(Collectors.toList()))); + insuranceAccountDetailPO.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + insuranceAccountDetailPO.setResourceFrom(ResourceFromEnum.SYSTEM.getValue()); + //缴纳组织=个税扣缴义务人 + insuranceAccountDetailPO.setSocialPayOrg(baseParam.getPaymentOrganization()); + if (projects.contains(ProjectTypeEnum.ALL.getValue())) { + if ("2".equals(baseParam.getSupplementType())) { + if (accountPO.getSocial() != null) { + accountPO.getSocial().setSocialPaymentBaseString(baseParam.getSocialPaymentBaseString()); + } + if (accountPO.getFund() != null) { + accountPO.getFund().setFundPaymentBaseString(baseParam.getFundPaymentBaseString()); + } + if (accountPO.getOther() != null) { + accountPO.getOther().setOtherPaymentBaseString(baseParam.getOtherPaymentBaseString()); + } + accountSocial(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + accountFund(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + accountOther(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } else if ("3".equals(baseParam.getSupplementType())) { + accountSupSocialByData(insuranceAccountDetailPO, baseParam); + accountSupFundByData(insuranceAccountDetailPO, baseParam); + accountSupOtherByData(insuranceAccountDetailPO, baseParam); + } else { + accountSocial(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + accountFund(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + accountOther(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } + + return account(insuranceAccountDetailPO); + } + if (projects.contains(ProjectTypeEnum.SOCIAL.getValue())) { + if ("2".equals(baseParam.getSupplementType())) { + if (accountPO.getSocial() != null) { + accountPO.getSocial().setSocialPaymentBaseString(baseParam.getSocialPaymentBaseString()); + } + accountSocial(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } else if ("3".equals(baseParam.getSupplementType())) { + accountSupSocialByData(insuranceAccountDetailPO, baseParam); + } else { + accountSocial(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } + + } + if (!projects.contains(ProjectTypeEnum.SOCIAL.getValue())) { + List ids = new ArrayList<>(); + List list = getICategoryMapper().listByDataType(DataTypeEnum.SYSTEM.getValue()); + + if (projects.contains(ProjectTypeEnum.ENDOWMENT_INSURANCE.getValue())) { + ICategoryPO insuranceCategoryPO = list.stream().filter(item -> SalaryI18nUtil.getI18nLabel(0, "养老保险").equals(item.getInsuranceName())).findFirst() + .get(); + ids.add(insuranceCategoryPO.getId()); + } + if (projects.contains(ProjectTypeEnum.MEDICAL_INSURANCE.getValue())) { + ICategoryPO insuranceCategoryPO = list.stream().filter(item -> SalaryI18nUtil.getI18nLabel(0, "医疗保险").equals(item.getInsuranceName())).findFirst() + .get(); + ids.add(insuranceCategoryPO.getId()); + } + if ("2".equals(baseParam.getSupplementType())) { + if (accountPO.getSocial() != null) { + accountPO.getSocial().setSocialPaymentBaseString(baseParam.getSocialPaymentBaseString()); + } + accountEndowmentInsurance(insuranceAccountDetailPO, accountPO, ids, baseParam.getSupplementaryMonth()); + } else if ("3".equals(baseParam.getSupplementType())) { + accountSupEndowmentInsuranceByData(insuranceAccountDetailPO, baseParam, ids); + } else { + accountEndowmentInsurance(insuranceAccountDetailPO, accountPO, ids, baseParam.getSupplementaryMonth()); + } + + } + if (projects.contains(ProjectTypeEnum.FUND.getValue())) { + if ("2".equals(baseParam.getSupplementType())) { + if (accountPO.getFund() != null) { + accountPO.getFund().setFundPaymentBaseString(baseParam.getFundPaymentBaseString()); + } + accountFund(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } else if ("3".equals(baseParam.getSupplementType())) { + accountSupFundByData(insuranceAccountDetailPO, baseParam); + } else { + accountFund(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } + } + if (projects.contains(ProjectTypeEnum.OTHER.getValue())) { + + if ("2".equals(baseParam.getSupplementType())) { + if (accountPO.getOther() != null) { + accountPO.getOther().setOtherPaymentBaseString(baseParam.getOtherPaymentBaseString()); + } + accountOther(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } else if ("3".equals(baseParam.getSupplementType())) { + accountSupOtherByData(insuranceAccountDetailPO, baseParam); + } else { + accountOther(insuranceAccountDetailPO, accountPO, baseParam.getSupplementaryMonth()); + } + + } + + return account(insuranceAccountDetailPO); + } + + public void accountSupFundByData(InsuranceAccountDetailPO insuranceAccountDetailPO, SupplementAccountBaseParam baseParam) { + //公积金个人 + if (StringUtils.isNotBlank(baseParam.getFundPaymentPerString())) { + List fundPer = new ArrayList<>(); + HashMap fundPerson = JSON.parseObject(baseParam.getFundPaymentPerString(), new HashMap().getClass()); + fundPerson.forEach((k, v) -> { + BigDecimal result = new BigDecimal(v); + fundPer.add(result); + }); + insuranceAccountDetailPO.setFundPerJson(baseParam.getFundPaymentPerString()); + BigDecimal fundPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : fundPer) { + fundPerSum = fundPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setFundPerSum(fundPerSum.toPlainString()); + } + //公积金单位 + if (StringUtils.isNotBlank(baseParam.getFundPaymentComString())) { + List fundCom = new ArrayList<>(); + HashMap fundComMap = JSON.parseObject(baseParam.getFundPaymentComString(), new HashMap().getClass()); + fundComMap.forEach((k, v) -> { + BigDecimal result = new BigDecimal(v); + fundCom.add(result); + }); + insuranceAccountDetailPO.setFundComJson(baseParam.getFundPaymentComString()); + BigDecimal fundComSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : fundCom) { + fundComSum = fundComSum.add(bigDecimal); + } + insuranceAccountDetailPO.setFundComSum(fundComSum.toPlainString()); + } + } + + public void accountSupOtherByData(InsuranceAccountDetailPO insuranceAccountDetailPO, SupplementAccountBaseParam baseParam) { + //其他福利个人 + if (StringUtils.isNotBlank(baseParam.getOtherPaymentPerString())) { + List otherPer = new ArrayList<>(); + HashMap otherPerMap = JSON.parseObject(baseParam.getOtherPaymentPerString(), new HashMap().getClass()); + otherPerMap.forEach((k, v) -> { + BigDecimal result = new BigDecimal(v); + otherPer.add(result); + }); + insuranceAccountDetailPO.setOtherPerJson(baseParam.getOtherPaymentPerString()); + BigDecimal otherPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : otherPer) { + otherPerSum = otherPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setOtherPerSum(otherPerSum.toPlainString()); + } + //其他福利单位 + if (StringUtils.isNotBlank(baseParam.getOtherPaymentComString())) { + List otherCom = new ArrayList<>(); + HashMap otherComMap = JSON.parseObject(baseParam.getOtherPaymentComString(), new HashMap().getClass()); + otherComMap.forEach((k, v) -> { + BigDecimal result = new BigDecimal(v); + otherCom.add(result); + }); + insuranceAccountDetailPO.setOtherComJson(baseParam.getOtherPaymentComString()); + BigDecimal otherComSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : otherCom) { + otherComSum = otherComSum.add(bigDecimal); + } + insuranceAccountDetailPO.setOtherComSum(otherComSum.toPlainString()); + } + } + + public void accountSupSocialByData(InsuranceAccountDetailPO insuranceAccountDetailPO, SupplementAccountBaseParam baseParam) { + //社保个人 + if (StringUtils.isNotBlank(baseParam.getSocialPaymentPerString())) { + List socialPer = new ArrayList<>(); + HashMap archivesPerson = JSON.parseObject(baseParam.getSocialPaymentPerString(), new HashMap().getClass()); + archivesPerson.forEach((k, v) -> { + BigDecimal result = new BigDecimal(v); + socialPer.add(result); + }); + insuranceAccountDetailPO.setSocialPerJson(baseParam.getSocialPaymentPerString()); + BigDecimal socialPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : socialPer) { + socialPerSum = socialPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setSocialPerSum(socialPerSum.toPlainString()); + } + //社保单位 + if (StringUtils.isNotBlank(baseParam.getSocialPaymentComString())) { + List socialCom = new ArrayList<>(); + HashMap archivesCom = JSON.parseObject(baseParam.getSocialPaymentComString(), new HashMap().getClass()); + archivesCom.forEach((k, v) -> { + BigDecimal result = new BigDecimal(v); + socialCom.add(result); + }); + insuranceAccountDetailPO.setSocialComJson(baseParam.getSocialPaymentComString()); + BigDecimal socialComSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : socialCom) { + socialComSum = socialComSum.add(bigDecimal); + } + insuranceAccountDetailPO.setSocialComSum(socialComSum.toPlainString()); + } + } + + public InsuranceAccountDetailPO accountEndowmentInsurance(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, List categoryIds, String billMonth) { + if (accountPO.getSocial() != null) { + InsuranceArchivesSocialSchemePO socialPO = accountPO.getSocial(); + insuranceAccountDetailPO.setSocialPayOrg(socialPO.getPaymentOrganization()); + insuranceAccountDetailPO.setSocialAccount(socialPO.getSocialAccount()); + insuranceAccountDetailPO.setSocialSchemeId(socialPO.getSocialSchemeId()); + insuranceAccountDetailPO.setSocialPaymentBaseString(socialPO.getSocialPaymentBaseString()); + insuranceAccountDetailPO.setSocialPaymentComBaseString(socialPO.getSocialPaymentComBaseString()); + //判断是否在起始缴纳月和最后缴纳月之间 + Boolean inDataRange = SalaryDateUtil.monthInRange(billMonth, socialPO.getSocialStartTime(), socialPO.getSocialEndTime()); + + if ((Objects.equals(NonPaymentEnum.YES.getValue(), socialPO.getNonPayment()) || socialPO.getNonPayment() == null) && socialPO.getSocialSchemeId() != null && inDataRange) { + List detailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(socialPO.getSocialSchemeId()); + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); + //方案中包含的需要缴纳社保的个人福利 + int monthIndex = Integer.parseInt(billMonth.split("-")[1]) - 1; + Map schemeperson = detailPOS.stream() + .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) + && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_PERSON.getValue()) + && (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1")))) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesPerson = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + //需要核算社保的福利id 个人 + List needArchivesPerson = new ArrayList<>(); + if (archivesPerson != null) { + categoryIds.forEach(item -> { + if (archivesPerson.containsKey(String.valueOf(item)) && schemeperson.containsKey(item)) { + if (StringUtils.isNotBlank(archivesPerson.get(String.valueOf(item)))) { + needArchivesPerson.add(item); + } + } + }); + } + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(schemeperson, billMonth, socialPO.getSocialStartTime()); + + List socialPer = new ArrayList<>(); + Map socialPerJsonMap = new HashMap<>(); + needArchivesPerson.forEach(e -> { + InsuranceSchemeDetailPO po = schemeperson.get(e); + BigDecimal paymentProportion = new BigDecimal(po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (Objects.equals(po.getPaymentCycle(), 1)) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + socialPerJsonMap.put(String.valueOf(e), result.toPlainString()); + socialPer.add(result); + }); + insuranceAccountDetailPO.setSocialPerJson(JSON.toJSONString(socialPerJsonMap)); + BigDecimal socialPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : socialPer) { + socialPerSum = socialPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setSocialPerSum(socialPerSum.toPlainString()); + //方案中包含的需要缴纳社保的单位福利 + Map schemeCom = detailPOS.stream() + .filter(item -> Objects.equals(IsPaymentEnum.YES.getValue(), item.getIsPayment()) && Objects.equals(item.getPaymentScope(), PaymentScopeEnum.SCOPE_COMPANY.getValue()) && + (item.getPaymentCycle() == null || item.getPaymentCycle() == 0 || (item.getPaymentCycle() == 1 && String.valueOf(item.getCycleSetting().charAt(monthIndex)).equals("1")))) + .collect( + Collectors.toMap(InsuranceSchemeDetailPO::getInsuranceId, Function.identity())); + //档案中包含的基数信息 + HashMap archivesCom = JSON.parseObject(socialPO.getSocialPaymentBaseString(), new HashMap().getClass()); + //需要核算社保的福利id 单位 + List needArchivesCom = new ArrayList<>(); + if (archivesCom != null) { + categoryIds.forEach(item -> { + if (archivesCom.containsKey(String.valueOf(item)) && schemeCom.containsKey(item)) { + if (StringUtils.isNotBlank(archivesCom.get(String.valueOf(item)))) { + needArchivesCom.add(item); + } + } + }); + //判断核算周期、核算月、福利起始缴纳月的关系 + checkCycleSettingWithStartMonth(schemeCom, billMonth, socialPO.getSocialStartTime()); + } + List socialCom = new ArrayList<>(); + Map sociaComJsonMap = new HashMap<>(); + needArchivesCom.forEach(e -> { + InsuranceSchemeDetailPO po = schemeCom.get(e); + BigDecimal paymentProportion = new BigDecimal(po.getPaymentProportion()).divide(new BigDecimal("100")); + BigDecimal paymentNum = new BigDecimal((ObjectUtils.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); + BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); + Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + BigDecimal result = new BigDecimal("0"); + if (Objects.equals(po.getPaymentCycle(), 1)) { + int monthValue = 1; + for (int i = monthIndex - 1; i >= 0; i--) { + String cycleValue = po.getCycleSetting().charAt(i) + ""; + if (Integer.parseInt(cycleValue) == 1) { + break; + } + monthValue++; + } + if (po.getAccountType() == 1) { + paymentNum = paymentNum.multiply(new BigDecimal(monthValue)); + fixedCost = fixedCost.multiply(new BigDecimal(monthValue)); + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } else { + for (int i = 0; i < monthValue; i++) { + result = result.add(SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost))); + } + } + } else { + result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); + } + + sociaComJsonMap.put(String.valueOf(e), result.toPlainString()); + socialCom.add(result); + + }); + insuranceAccountDetailPO.setSocialComJson(JSON.toJSONString(sociaComJsonMap)); + BigDecimal socialComSum = new BigDecimal("0"); + for (BigDecimal decimal : socialCom) { + socialComSum = socialComSum.add(decimal); + } + insuranceAccountDetailPO.setSocialComSum(socialComSum.toPlainString()); + } + } + return insuranceAccountDetailPO; + } + + public void accountSupEndowmentInsuranceByData(InsuranceAccountDetailPO insuranceAccountDetailPO, SupplementAccountBaseParam baseParam, List ids) { + //社保个人 + if (StringUtils.isNotBlank(baseParam.getSocialPaymentPerString())) { + List socialPer = new ArrayList<>(); + HashMap archivesPerson = JSON.parseObject(baseParam.getSocialPaymentPerString(), new HashMap().getClass()); + HashMap socialPerson = new HashMap<>(); + archivesPerson.forEach((k, v) -> { + if (ids.contains(Long.valueOf(k))) { + socialPerson.put(k, v); + BigDecimal result = new BigDecimal(v); + socialPer.add(result); + } + + }); + insuranceAccountDetailPO.setSocialPerJson(JSON.toJSONString(socialPerson)); + BigDecimal socialPerSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : socialPer) { + socialPerSum = socialPerSum.add(bigDecimal); + } + insuranceAccountDetailPO.setSocialPerSum(socialPerSum.toPlainString()); + } + //社保单位 + if (StringUtils.isNotBlank(baseParam.getSocialPaymentComString())) { + List socialCom = new ArrayList<>(); + HashMap archivesCom = JSON.parseObject(baseParam.getSocialPaymentComString(), new HashMap().getClass()); + HashMap socialComMap = new HashMap<>(); + archivesCom.forEach((k, v) -> { + if (ids.contains(Long.valueOf(k))) { + socialComMap.put(k, v); + BigDecimal result = new BigDecimal(v); + socialCom.add(result); + } + }); + insuranceAccountDetailPO.setSocialComJson(JSON.toJSONString(socialComMap)); + BigDecimal socialComSum = new BigDecimal("0"); + for (BigDecimal bigDecimal : socialCom) { + socialComSum = socialComSum.add(bigDecimal); + } + insuranceAccountDetailPO.setSocialComSum(socialComSum.toPlainString()); + } + } + + public void batchSaveSupplementAccount(List pos) { + if (CollectionUtils.isEmpty(pos)) { + return; + } + batchSaveAccountInspectDetail(pos); + getInsuranceAccountDetailMapper().batchDelSupplementAccountDetails(pos); + encryptUtil.encryptList(pos, InsuranceAccountDetailPO.class); + List> lists = splitDetailList(pos, 20); + lists.forEach(subList -> { + getInsuranceAccountDetailMapper().batchSaveAccountDetails(subList); + }); + //删除日志 +// pos.stream().forEach(item -> { +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetId(String.valueOf(item.getId())); +// insuranceSchemeContext.setTargetName(String.valueOf(item.getEmployeeId())); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.DELETE.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100448, "删除核算记录")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100448, "删除核算记录")); +// insuranceSchemeContext.setNewValues(item); +// siAccountLoggerTemplate.write(insuranceSchemeContext); +// }); + //插入日志 +// pos.stream().forEach(item -> { +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetId(String.valueOf(item.getId())); +// insuranceSchemeContext.setTargetName(String.valueOf(item.getEmployeeId())); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.ADD.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100494, "新建核算记录")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100494, "新建核算记录")); +// insuranceSchemeContext.setNewValues(item); +// siAccountLoggerTemplate.write(insuranceSchemeContext); +// }); + } + + public void siDeleteCommonAccount(SaveCommonAccountParam param) { + ValidUtil.doValidator(param); + SalaryAssert.notEmpty(param.getIncludes(), SalaryI18nUtil.getI18nLabel(0, "参数错误")); + //根据id批量删除 + if (param.getIds().size() > 0) { + getInsuranceAccountDetailMapper().batchDelAccountDetailsByIds(param.getIds()); + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "请勾选需要删除的数据项！")); + } + //记录日志 +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetId(String.join(",", param.getIncludes().stream().map(item -> String.valueOf(item)).collect(Collectors.toList()))); +// insuranceSchemeContext.setTargetName(param.getBillMonth()); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.ADD.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100462, "新增台账")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100462, "新增台账")); +// insuranceSchemeContext.setNewValues(param); +// siAccountLoggerTemplate.write(insuranceSchemeContext); + updateBatchAccount(AccountParam.builder().billMonth(param.getBillMonth()).paymentOrganization(param.getPaymentOrganization()).build()); + } + + public void siDeleteSupplementaryAccount(List param) { + SalaryAssert.notEmpty(param, SalaryI18nUtil.getI18nLabel(0, "参数错误")); + boolean valid = param.stream().anyMatch(item -> item.getEmployeeId() == null + || StringUtils.isBlank(item.getSupplementaryMonth()) + || StringUtils.isBlank(item.getBillMonth())); + if (valid) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "参数错误")); + } + getInsuranceAccountDetailMapper().batchDelSupplementDetailsByIds(param); +// param.stream().forEach(item -> { +// LoggerContext insuranceSchemeContext = new LoggerContext(); +// insuranceSchemeContext.setTargetName(item.getBillMonth()); +// insuranceSchemeContext.setOperateType(OperateTypeEnum.DELETE.getValue()); +// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100490, "删除补缴核算记录")); +// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100490, "删除补缴核算记录")); +// insuranceSchemeContext.setNewValues(item); +// siAccountLoggerTemplate.write(insuranceSchemeContext); +// }); + updateBatchAccount(AccountParam.builder().billMonth(param.get(0).getBillMonth()).paymentOrganization(param.get(0).getPaymentOrganization()).build()); + } + + public void accountInspect(Collection ids, String billMonth, Long paymentOrganization) { + List insuranceAccountInspectPOS = allInspects(ids, billMonth); + SalaryAssert.notEmpty(insuranceAccountInspectPOS, SalaryI18nUtil.getI18nLabel(0, "无核算数据")); + List commonInspects = insuranceAccountInspectPOS.stream() + .filter(e -> Objects.equals(e.getPaymentStatus(), PaymentStatusEnum.COMMON.getValue())) + .collect(Collectors.toList()); + List supplementInspects = insuranceAccountInspectPOS.stream() + .filter(e -> Objects.equals(e.getPaymentStatus(), PaymentStatusEnum.REPAIR.getValue())) + .collect(Collectors.toList()); + //核算正常缴纳 + if (CollectionUtils.isNotEmpty(commonInspects)) { + SaveCommonAccountParam param = new SaveCommonAccountParam(); + param.setBillMonth(billMonth); + param.setIncludes(commonInspects.stream().map(InsuranceAccountInspectPO::getEmployeeId).collect(Collectors.toList())); + siSaveCommonAccount(param); + } + //核算补缴 + if (CollectionUtils.isNotEmpty(supplementInspects)) { + List baseList = new ArrayList<>(); + supplementInspects.forEach(e -> { + SupplementAccountBaseParam base = new SupplementAccountBaseParam(); + base.setBillMonth(billMonth); + base.setProjects( + e.getSupplementaryProjects() == null ? null : Arrays.stream(e.getSupplementaryProjects().split(",")).map(Integer::valueOf).collect(Collectors.toList())); + base.setEmployeeId(e.getEmployeeId()); + base.setSupplementaryMonth(e.getSupplementaryMonth()); + baseList.add(base); + }); + accountSupplement(baseList, baseList.stream().map(SupplementAccountBaseParam::getEmployeeId).collect(Collectors.toList()), paymentOrganization); + } + } + + public PageInfo siOverView(InsuranceAccountDetailParam queryParam) { + + List insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().selectList(queryParam.getBillMonth(), StringUtil.isBlank(queryParam.getPaymentOrganization()) ? null : Long.valueOf(queryParam.getPaymentOrganization())); + encryptUtil.decryptList(insuranceAccountDetailPOS, InsuranceAccountDetailPO.class); + //获取扣缴义务人信息 + List paymentList = getTaxAgentMapper().listAll(); + SalaryAssert.notEmpty(paymentList, SalaryI18nUtil.getI18nLabel(0, "该租户无扣缴义务人")); + Map paymentMap = paymentList.stream().collect(Collectors.toMap(TaxAgentPO::getId, Function.identity())); + List insuranceAccountViewListDTOS = buildRecords(insuranceAccountDetailPOS, paymentMap); + + PageInfo insuranceAccountViewListDTOPage = new PageInfo<>(insuranceAccountViewListDTOS, InsuranceAccountViewListDTO.class); + insuranceAccountViewListDTOPage.setTotal(insuranceAccountViewListDTOS.size()); + return insuranceAccountViewListDTOPage; + } + + @Override + public List buildRecords(List list, Map paymentMap) { + Map result = new HashMap<>(); + //根据组织分组,对社保进行统计 + Map> socialCollect = list.stream().filter(item -> item.getSocialPayOrg() != null) + .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getSocialPayOrg)); + socialCollect.forEach((k, v) -> { + if (result.get(k) == null) { + InsuranceAccountViewListDTO temp = new InsuranceAccountViewListDTO(); + temp.setPayOrg(paymentMap.get(k).getName()); + result.put(k, temp); + } + InsuranceAccountViewListDTO insuranceAccountViewListDTO = result.get(k); + accountSocialView(insuranceAccountViewListDTO, v); + }); + //根据组织分组，对公积金进行统计 + Map> fundCollect = list.stream().filter(item -> item.getSocialPayOrg() != null) + .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getSocialPayOrg)); + fundCollect.forEach((k, v) -> { + if (result.get(k) == null) { + InsuranceAccountViewListDTO temp = new InsuranceAccountViewListDTO(); + temp.setPayOrg(paymentMap.get(k).getName()); + result.put(k, temp); + } + InsuranceAccountViewListDTO insuranceAccountViewListDTO = result.get(k); + accountFundView(insuranceAccountViewListDTO, v); + }); + //根据组织分组,对其他福利进行统计 + Map> otherCollect = list.stream().filter(item -> item.getSocialPayOrg() != null) + .collect(Collectors.groupingBy(InsuranceAccountDetailPO::getSocialPayOrg)); + otherCollect.forEach((k, v) -> { + if (result.get(k) == null) { + InsuranceAccountViewListDTO temp = new InsuranceAccountViewListDTO(); + temp.setPayOrg(paymentMap.get(k).getName()); + result.put(k, temp); + } + InsuranceAccountViewListDTO insuranceAccountViewListDTO = result.get(k); + accountOtherView(insuranceAccountViewListDTO, v); + }); + //对各组织进行金额合计 + List viewDTOS = new ArrayList<>(); + result.forEach((k, v) -> { + BigDecimal socialPaySum = StringUtils.isBlank(v.getSocialPaySum()) ? new BigDecimal("0") : new BigDecimal(v.getSocialPaySum()); + BigDecimal fundPaySum = StringUtils.isBlank(v.getFundPaySum()) ? new BigDecimal("0") : new BigDecimal(v.getFundPaySum()); + BigDecimal otherPaySum = StringUtils.isBlank(v.getOtherPaySum()) ? new BigDecimal("0") : new BigDecimal(v.getOtherPaySum()); + v.setIndex(k); + BigDecimal sum = socialPaySum.add(fundPaySum).add(otherPaySum); + v.setSum(sum.toPlainString()); + viewDTOS.add(v); + }); + //合计 + InsuranceAccountViewListDTO insuranceAccountViewListDTO = new InsuranceAccountViewListDTO(); + int socialNum = 0; + int fundNum = 0; + int otherNum = 0; + BigDecimal socialSum = new BigDecimal("0"); + BigDecimal fundSum = new BigDecimal("0"); + BigDecimal otherSum = new BigDecimal("0"); + BigDecimal sum = new BigDecimal("0"); + for (InsuranceAccountViewListDTO item : viewDTOS) { + if (item.getSocialNum() != null) { + socialNum += item.getSocialNum(); + } + if (item.getFundNum() != null) { + fundNum += item.getFundNum(); + } + if (item.getOtherNum() != null) { + otherNum += item.getOtherNum(); + } + if (StringUtils.isNotBlank(item.getSocialPaySum())) { + socialSum = socialSum.add(new BigDecimal(item.getSocialPaySum())); + } + if (StringUtils.isNotBlank(item.getFundPaySum())) { + fundSum = fundSum.add(new BigDecimal(item.getFundPaySum())); + } + if (StringUtils.isNotBlank(item.getOtherPaySum())) { + otherSum = otherSum.add(new BigDecimal(item.getOtherPaySum())); + } + if (StringUtils.isNotBlank(item.getSum())) { + sum = sum.add(new BigDecimal(item.getSum())); + } + } + insuranceAccountViewListDTO.setSum(sum.toPlainString()); + insuranceAccountViewListDTO.setSocialPaySum(socialSum.toPlainString()); + insuranceAccountViewListDTO.setPayOrg(SalaryI18nUtil.getI18nLabel(0, "合计")); + insuranceAccountViewListDTO.setFundPaySum(fundSum.toPlainString()); + insuranceAccountViewListDTO.setOtherPaySum(otherSum.toPlainString()); + insuranceAccountViewListDTO.setSocialNum(socialNum); + insuranceAccountViewListDTO.setFundNum(fundNum); + insuranceAccountViewListDTO.setOtherNum(otherNum); + viewDTOS.add(insuranceAccountViewListDTO); + viewDTOS.forEach(e -> { + e.setSocialPaySum(StringUtils.isBlank(e.getSocialPaySum()) ? "0" : e.getSocialPaySum()); + e.setSocialNum(e.getSocialNum() == null ? 0 : e.getSocialNum()); + e.setFundNum(e.getFundNum() == null ? 0 : e.getFundNum()); + e.setFundPaySum(StringUtils.isBlank(e.getFundPaySum()) ? "0" : e.getFundPaySum()); + e.setOtherPaySum(StringUtils.isBlank(e.getOtherPaySum()) ? "0" : e.getOtherPaySum()); + e.setOtherNum(e.getOtherNum() == null ? 0 : e.getOtherNum()); + e.setSum(SalaryEntityUtil.thousandthConvert(e.getSum())); + e.setSocialPaySum(SalaryEntityUtil.thousandthConvert(e.getSocialPaySum())); + e.setOtherPaySum(SalaryEntityUtil.thousandthConvert(e.getOtherPaySum())); + e.setFundPaySum(SalaryEntityUtil.thousandthConvert(e.getFundPaySum())); + }); + return viewDTOS; + } + + public void accountOtherView(InsuranceAccountViewListDTO dto, List pos) { + int otherNum = 0; + BigDecimal otherPaySum = new BigDecimal("0"); + for (InsuranceAccountDetailPO item : pos) { + if (StringUtils.isNotBlank(item.getOtherSum()) && SalaryEntityUtil.string2DoubleDefault0(item.getOtherSum()) != 0.0) { + if (!PaymentStatusEnum.BALANCE.getValue().equals(item.getPaymentStatus())) { + otherNum += 1; + } + otherPaySum = otherPaySum.add(new BigDecimal(item.getOtherSum())); + } + } + dto.setOtherNum(otherNum); + dto.setOtherPaySum(otherPaySum.toPlainString()); + } + + public void accountFundView(InsuranceAccountViewListDTO dto, List pos) { + int fundNum = 0; + BigDecimal fundPaySum = new BigDecimal("0"); + for (InsuranceAccountDetailPO item : pos) { + if (StringUtils.isNotBlank(item.getFundSum()) && SalaryEntityUtil.string2DoubleDefault0(item.getFundSum()) != 0.0) { + if (!PaymentStatusEnum.BALANCE.getValue().equals(item.getPaymentStatus())) { + fundNum += 1; + } + fundPaySum = fundPaySum.add(new BigDecimal(item.getFundSum())); + } + } + dto.setFundNum(fundNum); + dto.setFundPaySum(fundPaySum.toPlainString()); + } + + public void accountSocialView(InsuranceAccountViewListDTO dto, List pos) { + int socialNum = 0; + BigDecimal socialPaySum = new BigDecimal("0"); + for (InsuranceAccountDetailPO item : pos) { + if (StringUtils.isNotBlank(item.getSocialSum()) && SalaryEntityUtil.string2DoubleDefault0(item.getSocialSum()) != 0.0 ) { + if (!PaymentStatusEnum.BALANCE.getValue().equals(item.getPaymentStatus())) { + socialNum += 1; + } + socialPaySum = socialPaySum.add(new BigDecimal(item.getSocialSum())); + } + } + dto.setSocialNum(socialNum); + dto.setSocialPaySum(socialPaySum.toPlainString()); + } + + /** + * 查询台账id是否已经薪资核算核算过 + * + * @param param + * @return + */ + public int checkIfBusinessAccounting(InsuranceAccountBatchPO param) { + List list = getSIAccountUtilMapper().checkIfBusinessaccounting(param.getId()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + return (int) list.stream().filter( f -> { + String billMonthBySob = sdf.format(convertSalaryMonthToBillMonth(f.getSalaryMonth(), f.getSocialSecurityCycleType())); + return f.getBillmonth().equals(billMonthBySob.substring(0, 7)); + }).count(); + } + + public Date convertSalaryMonthToBillMonth(Date salaryMonth, Integer socialSecurityCycleType) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(salaryMonth); + calendar.add(Calendar.MONTH, socialSecurityCycleType - 3); + return calendar.getTime(); + } + + /** + * 更新薪资台账 + * + * @param param + * @return + */ + public void updateById(InsuranceAccountBatchPO param) { + getInsuranceAccountBatchMapper().updateById(param); + } + + /** + * 更新福利台账 + */ + public void updateByEmployeeIdAndBillMonth(InsuranceAccountDetailPO insuranceAccountDetailPO) { + getInsuranceAccountDetailMapper().updateByEmployeeIdAndBillMonth(insuranceAccountDetailPO); + } + + /*****以上代码为SIAccountBiz中方法逻辑迁移，旨在减少Biz类的使用*****/ + } diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index ac3ec8488..93c929e46 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.TypeReference; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIAccountBiz; import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; @@ -68,7 +67,7 @@ public class SIExportServiceImpl extends Service implements SIExportService { private EncryptUtil encryptUtil = new EncryptUtil(); - private SIAccountBiz siAccountBiz = new SIAccountBiz(); +// private SIAccountBiz siAccountBiz = new SIAccountBiz(); private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); @@ -117,7 +116,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { List paymentList =getTaxAgentMapper().listAll(); SalaryAssert.notEmpty(paymentList, SalaryI18nUtil.getI18nLabel(100341, "该租户无扣缴义务人")); Map paymentMap = paymentList.stream().collect(Collectors.toMap(TaxAgentPO::getId, Function.identity())); - List insuranceAccountViewListDTOS = siAccountBiz.buildRecords(insuranceAccountDetailPOS, paymentMap); +// List insuranceAccountViewListDTOS = siAccountBiz.buildRecords(insuranceAccountDetailPOS, paymentMap); + List insuranceAccountViewListDTOS = getSIAccountService(user).buildRecords(insuranceAccountDetailPOS, paymentMap); List> excelSheetData = new ArrayList<>(); // 1.工作簿名称 diff --git a/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java b/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java index 7d1b8f757..646024f3d 100644 --- a/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java +++ b/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java @@ -77,7 +77,6 @@ public class AutoSiAccountAndFileJob extends BaseCronJob { user.setLastname("sysadmin"); Calendar accountTime= Calendar.getInstance(); -// prevMonth.setTimeInMillis(System.currentTimeMillis()); accountTime.set(Calendar.MONTH, accountTime.get(Calendar.MONTH) + Integer.parseInt(diffToCurrentMonth)); SimpleDateFormat s=new SimpleDateFormat("yyyy-MM"); diff --git a/src/com/engine/salary/web/SIExportController.java b/src/com/engine/salary/web/SIExportController.java index a37cd05c8..f3636c8dd 100644 --- a/src/com/engine/salary/web/SIExportController.java +++ b/src/com/engine/salary/web/SIExportController.java @@ -2,7 +2,6 @@ package com.engine.salary.web; import cn.hutool.core.util.BooleanUtil; import com.engine.common.util.ServiceUtil; -import com.engine.salary.biz.SIAccountBiz; import com.engine.salary.entity.siaccount.param.InspectAccountParam; import com.engine.salary.entity.siaccount.po.InsuranceAccountInspectPO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; @@ -85,8 +84,9 @@ public class SIExportController { @QueryParam("ids")List ids,@QueryParam("billMonth") String billMonth) { InspectAccountParam param = InspectAccountParam.builder().ids(ids).billMonth(billMonth).build(); User user = HrmUserVarify.getUser(request, response); - SIAccountBiz siAccountBiz = new SIAccountBiz(); - List insuranceAccountInspectPOS = siAccountBiz.allInspects(param.getIds(), param.getBillMonth()); +// SIAccountBiz siAccountBiz = new SIAccountBiz(); +// List insuranceAccountInspectPOS = siAccountBiz.allInspects(param.getIds(), param.getBillMonth()); + List insuranceAccountInspectPOS = getService(user).allInspects(param.getIds(), param.getBillMonth()); InsuranceArchivesListParam req = new InsuranceArchivesListParam(); req.setEmployeeIds(insuranceAccountInspectPOS.stream().map(InsuranceAccountInspectPO::getEmployeeId).distinct().collect(Collectors.toList())); XSSFWorkbook workbook = getSIExportWrapper(user).export(req); @@ -236,12 +236,13 @@ public class SIExportController { @Produces(MediaType.APPLICATION_OCTET_STREAM) public Response exportTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response) { InsuranceArchivesListParam param = buildParam(request); - SIAccountBiz siAccountBiz = new SIAccountBiz(); + User user = HrmUserVarify.getUser(request, response); +// SIAccountBiz siAccountBiz = new SIAccountBiz(); if (param.getInspectAll() != null && param.getInspectAll()) { - List insuranceAccountInspectPOS = siAccountBiz.allInspects(param.getIds(), param.getBillMonth()); +// List insuranceAccountInspectPOS = siAccountBiz.allInspects(param.getIds(), param.getBillMonth()); + List insuranceAccountInspectPOS = getService(user).allInspects(param.getIds(), param.getBillMonth()); param.setEmployeeIds(insuranceAccountInspectPOS.stream().map(InsuranceAccountInspectPO::getEmployeeId).distinct().collect(Collectors.toList())); } - User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSIImportWrapper(user).exportTemplate(param); String time = LocalDate.now().toString(); String fileName = ""; From e8aee9ab64e1fa81304c38353a20fbe7ceca94a4 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 19 Jan 2024 17:32:52 +0800 Subject: [PATCH 050/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=BC=BA=E5=A4=B1=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E9=A1=B9=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 103 +++++++++++++++---- 1 file changed, 85 insertions(+), 18 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 4f62417c6..ff5fe4727 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1,5 +1,6 @@ package com.engine.salary.biz; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -69,6 +70,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import static com.engine.salary.sys.constant.SalarySysConstant.WEL_BASE_AUTO_ADJUST; import static com.engine.salary.sys.constant.SalarySysConstant.WEL_BASE_DIFF_BY_PER_AND_COM; @@ -279,15 +281,19 @@ public class SIArchivesBiz { //判断是否要区分个人和单位福利基数 SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); boolean welBaseDiffSign = welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); + //判断是否要自动调整基数 + SalarySysConfPO welBaseAutoAdjust = getSalarySysConfService(user).getOneByCode(WEL_BASE_AUTO_ADJUST); + boolean welBaseAutoAdjustSign = welBaseAutoAdjust != null && welBaseAutoAdjust.getConfValue().equals(OpenEnum.OPEN.getValue()); + switch (welfareType) { case SOCIAL_SECURITY: - data = buildSocialPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign); + data = buildSocialPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign, welBaseAutoAdjustSign); break; case ACCUMULATION_FUND: - data = buildFundPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign); + data = buildFundPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign, welBaseAutoAdjustSign); break; case OTHER: - data = buildOtherPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign); + data = buildOtherPaymentForm(user, employeeId, schemeId, operateId, welfareType.getValue(), paymentOrganization, welBaseDiffSign, welBaseAutoAdjustSign); break; default: } @@ -302,19 +308,30 @@ public class SIArchivesBiz { * @param operateId * @return */ - public Map buildOtherPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign) { + public Map buildOtherPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign, boolean welBaseAutoAdjustSign) { Map dataMap = new HashMap<>(); InsuranceArchivesOtherSchemeDTO data = buildOtherForm(employeeId, operateId, paymentOrganization); + Map insuranceValueMap = new HashMap<>(); + Map insuranceComValueMap = new HashMap<>(); if (data != null) { - dataMap.put("data", JSONObject.parseObject(data.getOtherPaymentBaseString(), new TypeReference>() { - })); + insuranceValueMap = StrUtil.isNotBlank(data.getOtherPaymentBaseString()) + ? JSONObject.parseObject(data.getOtherPaymentBaseString(), new TypeReference>() {}) : new HashMap<>(); if (welBaseDiffSign) { - dataMap.put("comData", JSONObject.parseObject(data.getOtherPaymentComBaseString(), new TypeReference>() { - })); + insuranceComValueMap = StrUtil.isNotBlank(data.getOtherPaymentComBaseString()) + ? JSONObject.parseObject(data.getOtherPaymentComBaseString(), new TypeReference>() {}) : new HashMap<>(); } } List addGroups = new ArrayList<>(); List inputItems = buildPaymentBase(user, schemeId, welfareType); + //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 + for (SearchConditionItem item : inputItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("data", insuranceValueMap); addGroups.add(new SearchConditionGroup("其它福利缴纳基数", true, inputItems)); dataMap.put("items", addGroups); if (welBaseDiffSign) { @@ -322,6 +339,15 @@ public class SIArchivesBiz { List inputComItems = buildPaymentComBase(user, schemeId, welfareType); addComGroups.add(new SearchConditionGroup("其它福利缴纳基数", true, inputComItems)); dataMap.put("comItems", addComGroups); + + for (SearchConditionItem item : inputComItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceComValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceComValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("comData", insuranceComValueMap); } return dataMap; } @@ -334,20 +360,32 @@ public class SIArchivesBiz { * @param operateId * @return */ - public Map buildFundPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign) { + public Map buildFundPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign, boolean welBaseAutoAdjustSign) { Map dataMap = new HashMap<>(); InsuranceArchivesFundSchemeDTO data = buildFundForm(employeeId, operateId, paymentOrganization); + Map insuranceValueMap = new HashMap<>(); + Map insuranceComValueMap = new HashMap<>(); if (data != null) { - dataMap.put("data", JSONObject.parseObject(data.getFundPaymentBaseString(), new TypeReference>() { - })); + insuranceValueMap = StrUtil.isNotBlank(data.getFundPaymentBaseString()) + ? JSONObject.parseObject(data.getFundPaymentBaseString(), new TypeReference>() {}) : new HashMap<>(); if (welBaseDiffSign) { - dataMap.put("comData", JSONObject.parseObject(data.getFundPaymentComBaseString(), new TypeReference>() { - })); + insuranceComValueMap = StrUtil.isNotBlank(data.getFundPaymentComBaseString()) + ? JSONObject.parseObject(data.getFundPaymentComBaseString(), new TypeReference>() {}) : new HashMap<>(); } } + List addGroups = new ArrayList<>(); List inputItems = buildPaymentBase(user, schemeId, welfareType); + //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 + for (SearchConditionItem item : inputItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("data", insuranceValueMap); addGroups.add(new SearchConditionGroup("公积金缴纳基数", true, inputItems)); dataMap.put("items", addGroups); if (welBaseDiffSign) { @@ -355,6 +393,15 @@ public class SIArchivesBiz { List inputComItems = buildPaymentComBase(user, schemeId, welfareType); addComGroups.add(new SearchConditionGroup("公积金缴纳基数", true, inputComItems)); dataMap.put("comItems", addComGroups); + + for (SearchConditionItem item : inputComItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceComValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceComValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("comData", insuranceComValueMap); } return dataMap; } @@ -367,20 +414,31 @@ public class SIArchivesBiz { * @param operateId * @return */ - public Map buildSocialPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign) { + public Map buildSocialPaymentForm(User user, Long employeeId, Long schemeId, long operateId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign, boolean welBaseAutoAdjustSign) { Map dataMap = new HashMap<>(); InsuranceArchivesSocialSchemeDTO data = buildSocialForm(employeeId, operateId, paymentOrganization); + Map insuranceValueMap = new HashMap<>(); + Map insuranceComValueMap = new HashMap<>(); if (data != null) { - dataMap.put("data", JSONObject.parseObject(data.getSchemePaymentBaseString(), new TypeReference>() { - })); + insuranceValueMap = StrUtil.isNotBlank(data.getSchemePaymentBaseString()) + ? JSONObject.parseObject(data.getSchemePaymentBaseString(), new TypeReference>() {}) : new HashMap<>(); if (welBaseDiffSign) { - dataMap.put("comData", JSONObject.parseObject(data.getSchemePaymentComBaseString(), new TypeReference>() { - })); + insuranceComValueMap = StrUtil.isNotBlank(data.getSchemePaymentComBaseString()) + ? JSONObject.parseObject(data.getSchemePaymentComBaseString(), new TypeReference>() {}) : new HashMap<>(); } } List addGroups = new ArrayList<>(); List inputItems = buildPaymentBase(user, schemeId, welfareType); + //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 + for (SearchConditionItem item : inputItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("data", insuranceValueMap); addGroups.add(new SearchConditionGroup("社保缴纳基数", true, inputItems)); dataMap.put("items", addGroups); if (welBaseDiffSign) { @@ -388,6 +446,15 @@ public class SIArchivesBiz { List inputComItems = buildPaymentComBase(user, schemeId, welfareType); addComGroups.add(new SearchConditionGroup("社保缴纳基数", true, inputComItems)); dataMap.put("comItems", addComGroups); + + for (SearchConditionItem item : inputComItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceComValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceComValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("comData", insuranceComValueMap); } return dataMap; From d09034b17b3f6301c3662ec1562e6986a1308d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 22 Jan 2024 10:38:18 +0800 Subject: [PATCH 051/169] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/bo/SalaryStatisticsReportBO.java | 27 ++++++++ .../entity/po/SalaryStatisticsItemPO.java | 38 +++++----- .../SalaryStatisticsReportServiceImpl.java | 69 ++++--------------- 3 files changed, 59 insertions(+), 75 deletions(-) diff --git a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java index 10e42f83a..2f6986f7a 100644 --- a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java +++ b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java @@ -1,5 +1,6 @@ package com.engine.salary.report.entity.bo; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; @@ -932,6 +933,16 @@ public class SalaryStatisticsReportBO { return sumDecimal; } + private static String handle4GroupValue(String dimCode, SalaryAcctEmployeePO sa, Map> salaryAcctResultValueMap, SalaryStatisticsItemPO item) { + if (salaryAcctResultValueMap.get(sa.getId()) != null) { + String value = salaryAcctResultValueMap.get(sa.getId()).get(dimCode); + if (StringUtils.isNotBlank(value)) { + return value; + } + } + return ""; + } + /** * 定量-单项式分组list分割 * @@ -960,6 +971,22 @@ public class SalaryStatisticsReportBO { return list.stream().filter(i -> ids.contains(i.getId())).collect(Collectors.toList()); } + public static List listAcctEmpByRationGroupIndividual(String groupIndividual, String dimCode, List list, Map yearMap, Map> salaryAcctResultValueMap, List salaryStatisticsItemList) { + Set ids = Sets.newHashSet(); + + for (SalaryAcctEmployeePO sa : list) { + salaryStatisticsItemList.forEach(item -> { + String value = handle4GroupValue(dimCode, sa, salaryAcctResultValueMap, item); + + if (StrUtil.equals(groupIndividual, value)) { + ids.add(sa.getId()); + } + }); + } + + return list.stream().filter(i -> ids.contains(i.getId())).collect(Collectors.toList()); + } + public static Map checkLoad(List salaryStatisticsItemList) { boolean isNow = false; boolean isLast = false; diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java index bcf430d57..e87d1b282 100644 --- a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java +++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java @@ -12,22 +12,22 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @ToString -//hrsa_salary_statistics_item") -//薪酬报表统计子表自定义统计项") +//hrsa_salary_statistics_item +//薪酬报表统计子表自定义统计项 public class SalaryStatisticsItemPO implements Serializable { private static final long serialVersionUID = 5335849418826222822L; - //主键id") + //主键id private Long id; - //统计报表id") + //统计报表id private Long statReportId; - //统计项名称") + //统计项名称 private String itemName; - //统计项集合") + //统计项集合 private String itemValue; /** @@ -43,7 +43,7 @@ public class SalaryStatisticsItemPO implements Serializable { * } * jsonToString */ - //计数规则") + //计数规则 private String countRule; /** @@ -59,7 +59,7 @@ public class SalaryStatisticsItemPO implements Serializable { * } * jsonToString */ - //求和规则") + //求和规则 private String sumRule; /** @@ -75,7 +75,7 @@ public class SalaryStatisticsItemPO implements Serializable { * } * jsonToString */ - //平均值规则") + //平均值规则 private String avgRule; /** @@ -91,7 +91,7 @@ public class SalaryStatisticsItemPO implements Serializable { * } * jsonToString */ - //最大值规则") + //最大值规则 private String maxRule; /** @@ -107,7 +107,7 @@ public class SalaryStatisticsItemPO implements Serializable { * } * jsonToString */ - //最小值规则") + //最小值规则 private String minRule; /** @@ -123,7 +123,7 @@ public class SalaryStatisticsItemPO implements Serializable { * } * jsonToString */ - //中位数规则") + //中位数规则 private String medianRule; @@ -161,7 +161,7 @@ public class SalaryStatisticsItemPO implements Serializable { */ private String tileRule; - //顺序") + //顺序 private Integer indexValue; /** @@ -169,22 +169,22 @@ public class SalaryStatisticsItemPO implements Serializable { * * @see UnitTypeEnum */ - //统计单位") + //统计单位 private Integer unitType; - //创建时间") + //创建时间 private Date createTime; - //更新时间") + //更新时间 private Date updateTime; - //创建人") + //创建人 private Long creator; - //是否删除") + //是否删除 private Integer deleteType; - //租户key") + //租户key private String tenantKey; private Collection ids; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 65a672424..19290c385 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -637,7 +637,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary case SalaryStatisticsDimensionConstant.DM_COMPANY_YEAR: return buildCompanyYearRecords(data, salaryAcctResultValueMap); default: - return buildSalaryItemRecords(data, dimension.getDimCode(), salaryAcctResultValueMap); + return buildSalaryItemRecords(dimension, data, salaryAcctResultValueMap); } // 定量-组距式分组 } else if (SalaryStatisticsDimensionTypeEnum.RATION_GROUP_SPACING.getValue().equals(dimension.getDimType())) { @@ -1920,80 +1920,37 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary return result; } - private PageInfo> buildSalaryItemRecords(SalaryStatisticsReportDataDTO data, String dimCode, Map> salaryAcctResultValueMap) { + private PageInfo> buildSalaryItemRecords(SalaryStatisticsDimensionPO dimension, SalaryStatisticsReportDataDTO data, Map> salaryAcctResultValueMap) { - //查询薪资项目存在的种类 - Set itemValues = new HashSet<>(); + //查询薪资项目存在的种类（维度） + Set dimensionSet = new HashSet<>(); for (Long k : salaryAcctResultValueMap.keySet()) { Map map = salaryAcctResultValueMap.get(k); - itemValues.add(map.getOrDefault(dimCode, "")); + dimensionSet.add(map.getOrDefault(dimension.getDimCode(), "未分组")); } - PageInfo> result = new PageInfo<>(); List> records = new ArrayList<>(); - Map> simpleUserInfoMap = getSimpleUserInfoList(data); - if (simpleUserInfoMap.isEmpty()) { - return result; - } - - Set companyYearSet = new HashSet<>(); - - Map empIdCompanyYearMap = new HashMap<>(); - Map lastEmpIdCompanyYearMap = new HashMap<>(); - Map sameEmpIdCompanyYearMap = new HashMap<>(); - simpleUserInfoMap.get(NOW_INFO).forEach(employee -> { - if (employee.getCompanyWorkYear() != null) { - companyYearSet.add(Util.null2String(employee.getCompanyWorkYear())); - empIdCompanyYearMap.put(employee.getEmployeeId(), Util.null2String(employee.getCompanyWorkYear())); - } - }); - simpleUserInfoMap.get(LAST_INFO).forEach(employee -> { - if (employee.getCompanyWorkYear() != null) { - lastEmpIdCompanyYearMap.put(employee.getEmployeeId(), Util.null2String(employee.getCompanyWorkYear())); - } - }); - simpleUserInfoMap.get(SAME_INFO).forEach(employee -> { - if (employee.getCompanyWorkYear() != null) { - sameEmpIdCompanyYearMap.put(employee.getEmployeeId(), Util.null2String(employee.getCompanyWorkYear())); - } - }); - - List companyYears = Lists.newArrayList(companyYearSet); - companyYears = companyYears.stream().sorted().collect(Collectors.toList()); + Map empIdYearMap = new HashMap<>(); + Map lastEmpIdYearMap = new HashMap<>(); + Map sameEmpIdYearMap = new HashMap<>(); String dimensionValue = data.getDimensionValue(); - companyYears.forEach(k -> { + dimensionSet.forEach(k -> { if (dimensionValue == null) { - List salaryAcctEmployees = data.getList().stream().filter(po -> Objects.equals(empIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); - List lastSalaryAcctEmployees = data.getLastList().stream().filter(po -> Objects.equals(lastEmpIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); - List sameSalaryAcctEmployees = data.getSameList().stream().filter(po -> Objects.equals(sameEmpIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); + List salaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getList(), empIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()); + List lastSalaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getLastList(), lastEmpIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()); + List sameSalaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getSameList(), sameEmpIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()); Map temp = new HashMap<>(); temp.put(DM, k); temp.putAll(SalaryStatisticsReportBO.calculateItem(salaryAcctEmployees, lastSalaryAcctEmployees, sameSalaryAcctEmployees, salaryAcctResultValueMap, data.getSalaryStatisticsItemList())); records.add(temp); } else if (StringUtils.equals(dimensionValue, k)) { - List salaryAcctEmployees = data.getList().stream().filter(po -> Objects.equals(empIdCompanyYearMap.get(po.getEmployeeId()), k)).collect(Collectors.toList()); + List salaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getList(), empIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()); data.setListByDimensionValue(salaryAcctEmployees); } }); - - if (dimensionValue == null) { - List noGroupingList = data.getList().stream().filter(po -> empIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); - List lastNoGroupingList = data.getLastList().stream().filter(po -> lastEmpIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); - List sameNoGroupingList = data.getSameList().stream().filter(po -> sameEmpIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(noGroupingList)) { - Map noGrouping = new HashMap<>(); - noGrouping.put(DM, SalaryI18nUtil.getI18nLabel(153462, "无分组")); - noGrouping.putAll(SalaryStatisticsReportBO.calculateItem(noGroupingList, lastNoGroupingList, sameNoGroupingList, salaryAcctResultValueMap, data.getSalaryStatisticsItemList())); - records.add(noGrouping); - } - } else if (StringUtils.equals(dimensionValue, "无分组")) { - List noGroupingList = data.getList().stream().filter(po -> empIdCompanyYearMap.get(po.getEmployeeId()) == null).collect(Collectors.toList()); - data.setListByDimensionValue(noGroupingList); - } - result.setList(records); return result; } From 5d3a371f56b80f872a6efc4190971682cdf372f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 22 Jan 2024 11:45:40 +0800 Subject: [PATCH 052/169] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryStatisticsReportServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 19290c385..9f1b4e245 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -398,7 +398,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary Map> salaryAcctEmpResultMap = SalaryEntityUtil.group2Map(salaryAcctResultValues, SalaryAcctResultPO::getSalaryAcctEmpId); Map> map = new HashMap<>(); salaryAcctEmpResultMap.forEach((k, v) -> { - Map collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), p -> Util.null2o(p.getResultValue()), (key1, key2) -> key2)); + Map collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), SalaryAcctResultPO::getResultValue, (key1, key2) -> key2)); map.put(k, collect); }); @@ -444,7 +444,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary List finalSalaryAcctEmpIds = getSalaryAcctResultService(user).listAcctEmpIdByAcctEmpId(salaryAcctEmployeeIds); Map> salaryAcctEmpResultMap = SalaryEntityUtil.group2Map(salaryAcctResultValues, SalaryAcctResultPO::getSalaryAcctEmpId); salaryAcctEmpResultMap.forEach((k, v) -> { - Map collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), p -> Util.null2o(p.getResultValue()), (key1, key2) -> key2)); + Map collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), SalaryAcctResultPO::getResultValue, (key1, key2) -> key2)); resultMap.put(k, collect); }); salaryAcctEmployeeIds.stream().forEach(id -> { @@ -1926,7 +1926,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary Set dimensionSet = new HashSet<>(); for (Long k : salaryAcctResultValueMap.keySet()) { Map map = salaryAcctResultValueMap.get(k); - dimensionSet.add(map.getOrDefault(dimension.getDimCode(), "未分组")); + dimensionSet.add(map.getOrDefault(dimension.getDimCode(), "")); } PageInfo> result = new PageInfo<>(); From 6ee8b5f044f711ff75eb92c48c4171810cb460d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 22 Jan 2024 15:41:38 +0800 Subject: [PATCH 053/169] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E4=B8=8D=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salaryBill/bo/SalaryBillBO.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java index 6075a27f7..8f016b34f 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java @@ -368,7 +368,8 @@ public class SalaryBillBO { return; } - content = content.replace("{薪资所属月}", SalaryDateUtil.getFormatYearMonth(salaryBillSendParam.getSalaryDate())); + content = content.replace("\n", "\r\n") + .replace("{薪资所属月}", SalaryDateUtil.getFormatYearMonth(salaryBillSendParam.getSalaryDate())); for (SalaryTemplateSalaryItemListDTO item : salaryBillSendParam.getEmployeeInformation().getItems()) { content = content.replace("{" + item.getName() + "}", item.getSalaryItemValue()); @@ -644,7 +645,7 @@ public class SalaryBillBO { boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString())) || (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString()) - && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString()))==0); + && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0); if (!isHide) { // 4.2.薪资项目 emailContent.append(""); @@ -724,7 +725,7 @@ public class SalaryBillBO { boolean isHide = (isHideNull && StringUtils.isEmpty(e.getOrDefault(keyName.toString(), StringUtils.EMPTY).toString())) || (isHideZero && NumberUtils.isCreatable(e.getOrDefault(keyName.toString(), "0").toString()) - && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString()))==0); + && BigDecimal.ZERO.compareTo(new BigDecimal(e.getOrDefault(keyName.toString(), "0").toString())) == 0); if (!isHide) { // 4.2.薪资项目 emailContent.append(""); From a3e281b3fe2fe929448b21ed4949f24709268efd Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 23 Jan 2024 10:00:26 +0800 Subject: [PATCH 054/169] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BA=BA=E5=91=98=E6=90=9C=E7=B4=A2=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/TaxAgentManageRangeServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 6e19d15a5..2c1a38017 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -566,6 +566,9 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM } List taxAgentExtRangePOS = getTaxAgentExtRangeMapper().list(TaxAgentExtRangePO.builder().taxAgentId(param.getTaxAgentId()).build()); + if(StringUtils.isNotBlank(param.getTargetName())) { + taxAgentExtRangePOS = taxAgentExtRangePOS.stream().filter(po -> po.getTargetName().contains(param.getTargetName())).collect(Collectors.toList()); + } return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), taxAgentExtRangePOS, TaxAgentExtRangePO.class); } From 94d72cd93c646a5ea80b211cb34ec95a5f7b1e96 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 23 Jan 2024 10:52:53 +0800 Subject: [PATCH 055/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryTemplateCopyParam.java | 2 + .../impl/SalaryTemplateServiceImpl.java | 56 ++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateCopyParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateCopyParam.java index bf0e24f1e..53fb50eaf 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateCopyParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateCopyParam.java @@ -23,6 +23,8 @@ public class SalaryTemplateCopyParam { // 模板名称") private String name; + private Long salarySobId; + public static void checkParam(SalaryTemplateCopyParam copyParam) { if (copyParam.getId() == null) { throw new SalaryRunTimeException("id必选"); diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 591261abb..cf325731f 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -2,6 +2,7 @@ package com.engine.salary.service.impl; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SalarySobBiz; @@ -16,15 +17,17 @@ import com.engine.salary.entity.salaryBill.param.SalaryTemplateQueryParam; import com.engine.salary.entity.salaryBill.param.SalaryTemplateSaveParam; import com.engine.salary.entity.salaryBill.po.SalaryBillItemNamePO; import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO; +import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.dto.SalarySobItemAggregateDTO; import com.engine.salary.entity.salarysob.dto.SalarySobItemDTO; import com.engine.salary.entity.salarysob.dto.SalarySobItemGroupDTO; -import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; -import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.entity.salarysob.po.*; import com.engine.salary.enums.salarybill.SalaryTemplateWhetherEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.salarysob.SalarySobEmpFieldMapper; import com.engine.salary.service.*; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.mzlion.core.utils.BeanUtils; @@ -68,6 +71,14 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate return ServiceUtil.getService(SalaryBillItemNameServiceImpl.class, user); } + private SalarySobEmpFieldService getSalarySobEmpFieldService(User user) { + return (SalarySobEmpFieldService) ServiceUtil.getService(SalarySobEmpFieldServiceImpl.class, user); + } + + private SalarySobEmpFieldMapper getSalarySobEmpFieldMapper() { + return MapperProxyFactory.getProxy(SalarySobEmpFieldMapper.class); + } + @Override public SalaryTemplatePO getById(Long id) { return mapper.getById(id); @@ -272,6 +283,47 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate salaryTemplateNew.setId(null); salaryTemplateNew.setName(copyParam.getName()); salaryTemplateNew.setUseType(SalaryTemplateWhetherEnum.FALSE.getValue()); + + //20240122逻辑变更，拷贝工资单模板时，可变更薪资账套 + if (copyParam.getSalarySobId() != null && !copyParam.getSalarySobId().equals(salaryTemplate.getSalarySobId())) { + // 查询薪资账套的员工信息字段 + List salarySobEmpFieldPOS = getSalarySobEmpFieldService(user).listBySalarySobId(copyParam.getSalarySobId()); + List empFieldCodeList = salarySobEmpFieldPOS.stream().map(SalarySobEmpFieldPO::getFieldCode).collect(Collectors.toList()); + Map empFieldCodeWithIdMap = SalaryEntityUtil.convert2Map(salarySobEmpFieldPOS, SalarySobEmpFieldPO::getFieldCode, SalarySobEmpFieldPO::getId); + // 查询薪资账套的薪资项目副本 + List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobIdWithHideItem(copyParam.getSalarySobId()); + List salaryItemIdList = salarySobItemPOS.stream().map(SalarySobItemPO::getSalaryItemId).collect(Collectors.toList()); + //拷贝数据中的薪资项目 + List salaryItemSettingList = JSONArray.parseArray(salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class); + for (SalaryTemplateSalaryItemSetListDTO salaryItemSetting : salaryItemSettingList) { + if ("111111111111111111".equals(salaryItemSetting.getGroupId()) && salaryItemSetting.getItems() != null) { + List newItems = new ArrayList<>(); + for (SalaryTemplateSalaryItemListDTO templateItem : salaryItemSetting.getItems()) { + SalarySobEmpFieldPO empFieldPO = getSalarySobEmpFieldMapper().getById(Long.valueOf(templateItem.getSalaryItemId())); + if (empFieldCodeList.contains(empFieldPO.getFieldCode()) && empFieldCodeWithIdMap.get(empFieldPO.getFieldCode()) != null) { + templateItem.setId(empFieldCodeWithIdMap.get(empFieldPO.getFieldCode()).toString()); + templateItem.setSalaryItemId(empFieldCodeWithIdMap.get(empFieldPO.getFieldCode()).toString()); + newItems.add(templateItem); + } + } + salaryItemSetting.setItems(newItems); + } else { + List newItems = new ArrayList<>(); + for (SalaryTemplateSalaryItemListDTO templateItem : salaryItemSetting.getItems()) { + SalarySobEmpFieldPO empFieldPO = getSalarySobEmpFieldMapper().getById(Long.valueOf(templateItem.getSalaryItemId())); + if (empFieldCodeList.contains(empFieldPO.getFieldCode()) && empFieldCodeWithIdMap.get(empFieldPO.getFieldCode()) != null) { + templateItem.setId(empFieldCodeWithIdMap.get(empFieldPO.getFieldCode()).toString()); + templateItem.setSalaryItemId(empFieldCodeWithIdMap.get(empFieldPO.getFieldCode()).toString()); + newItems.add(templateItem); + } + } + salaryItemSetting.setItems(newItems); + } + } + List replenishSalaryItemSettingList = JSONArray.parseArray(salaryTemplate.getReplenishSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class); + + } + mapper.insert(salaryTemplateNew); // 复制工资单自定义名称信息 From 2d24fbfa231e1ed88f52de05ceb40f7c73f9d7b9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 23 Jan 2024 11:34:36 +0800 Subject: [PATCH 056/169] =?UTF-8?q?=E5=9B=9E=E7=AE=97=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E6=94=BE=E5=90=8E=E4=B8=8D=E8=83=BD=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E5=9B=9E=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/bo/SalaryAcctRecordBO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index 53eb473b6..e0fad94bd 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -73,7 +73,9 @@ public class SalaryAcctRecordBO { } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && ( salarySendMap.get(salaryAcctRecordPO.getId()) ==Boolean.TRUE ) ){ btnList.add(new WeaTableOperate("查看", null, "3")); btnList.add(new WeaTableOperate("重新核算", null, "4")); - btnList.add(new WeaTableOperate("回算", null, "5")); + if(salaryAcctRecordPO.getBackCalcStatus() == null || salaryAcctRecordPO.getBackCalcStatus() == NumberUtils.INTEGER_ZERO) { + btnList.add(new WeaTableOperate("回算", null, "5")); + } } else { btnList.add(new WeaTableOperate("查看", null, "3")); btnList.add(new WeaTableOperate("重新核算", null, "4")); From 2a67ca9238c65bb721f5c4abfcb1645c90994d92 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 23 Jan 2024 13:55:49 +0800 Subject: [PATCH 057/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=E6=94=B9=E9=80=A02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryTemplateServiceImpl.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index cf325731f..c778138ad 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.salary.service.impl; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -294,7 +295,8 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobIdWithHideItem(copyParam.getSalarySobId()); List salaryItemIdList = salarySobItemPOS.stream().map(SalarySobItemPO::getSalaryItemId).collect(Collectors.toList()); //拷贝数据中的薪资项目 - List salaryItemSettingList = JSONArray.parseArray(salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class); + List salaryItemSettingList = StrUtil.isNotBlank(salaryTemplate.getSalaryItemSetting()) + ? JSONArray.parseArray(salaryTemplate.getSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class) : new ArrayList<>(); for (SalaryTemplateSalaryItemSetListDTO salaryItemSetting : salaryItemSettingList) { if ("111111111111111111".equals(salaryItemSetting.getGroupId()) && salaryItemSetting.getItems() != null) { List newItems = new ArrayList<>(); @@ -307,7 +309,20 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate } } salaryItemSetting.setItems(newItems); - } else { + } else if (salaryItemSetting.getItems() != null){ + List newItems = new ArrayList<>(); + for (SalaryTemplateSalaryItemListDTO templateItem : salaryItemSetting.getItems()) { + if (salaryItemIdList.contains(Long.valueOf(templateItem.getSalaryItemId()))) { + newItems.add(templateItem); + } + } + salaryItemSetting.setItems(newItems); + } + } + List replenishSalaryItemSettingList = StrUtil.isNotBlank(salaryTemplate.getReplenishSalaryItemSetting()) + ? JSONArray.parseArray(salaryTemplate.getReplenishSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class): new ArrayList<>(); + for (SalaryTemplateSalaryItemSetListDTO salaryItemSetting : replenishSalaryItemSettingList) { + if ("111111111111111111".equals(salaryItemSetting.getGroupId()) && salaryItemSetting.getItems() != null) { List newItems = new ArrayList<>(); for (SalaryTemplateSalaryItemListDTO templateItem : salaryItemSetting.getItems()) { SalarySobEmpFieldPO empFieldPO = getSalarySobEmpFieldMapper().getById(Long.valueOf(templateItem.getSalaryItemId())); @@ -318,10 +333,19 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate } } salaryItemSetting.setItems(newItems); + } else if (!"333333333333333333".equals(salaryItemSetting.getGroupId()) && salaryItemSetting.getItems() != null){ + List newItems = new ArrayList<>(); + for (SalaryTemplateSalaryItemListDTO templateItem : salaryItemSetting.getItems()) { + if (salaryItemIdList.contains(Long.valueOf(templateItem.getSalaryItemId()))) { + newItems.add(templateItem); + } + } + salaryItemSetting.setItems(newItems); } } - List replenishSalaryItemSettingList = JSONArray.parseArray(salaryTemplate.getReplenishSalaryItemSetting(), SalaryTemplateSalaryItemSetListDTO.class); - + salaryTemplateNew.setSalaryItemSetting(salaryItemSettingList.size() > 0 ? JSONUtil.toJsonStr(salaryItemSettingList) : ""); + salaryTemplateNew.setReplenishSalaryItemSetting(replenishSalaryItemSettingList.size() > 0 ? JSONUtil.toJsonStr(replenishSalaryItemSettingList) : ""); + salaryTemplateNew.setSalarySobId(copyParam.getSalarySobId()); } mapper.insert(salaryTemplateNew); From 887ec2084a32aec3dfdfd2ef5bcd1c9c92efb3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 23 Jan 2024 14:06:56 +0800 Subject: [PATCH 058/169] =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/util/excel/ExcelUtil.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/com/engine/salary/util/excel/ExcelUtil.java b/src/com/engine/salary/util/excel/ExcelUtil.java index 877714295..2a482e42d 100644 --- a/src/com/engine/salary/util/excel/ExcelUtil.java +++ b/src/com/engine/salary/util/excel/ExcelUtil.java @@ -1,7 +1,9 @@ package com.engine.salary.util.excel; +import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO; import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.FillPatternType; @@ -10,7 +12,12 @@ import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.xssf.usermodel.*; import java.awt.*; +import java.beans.BeanInfo; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -69,6 +76,41 @@ public class ExcelUtil { return workbook; } + public static XSSFWorkbook genWorkbook(String sheetName, List rowList) { + List headerList = Lists.newArrayList(); + List dataIndexList = Lists.newArrayList(); + // 解析表头 + ExcelUtil.parseHeader(TaxDeclarationLaborListDTO.class, headerList, dataIndexList); + + List> rows = new ArrayList<>(); + rows.add(headerList); + for (int i = 0; i < rowList.size(); i++) { + List row = Lists.newArrayListWithExpectedSize(dataIndexList.size()); + for (int j = 0; j < dataIndexList.size(); j++) { + Object value = getValue(rowList.get(i), dataIndexList.get(j)); + row.add(value); + } + rows.add(row); + } + return genWorkbookV2(rows, sheetName); + } + + private static Object getValue(T t, String fieldName) { + Object value = null; + try { + BeanInfo beanInfo = Introspector.getBeanInfo(t.getClass()); + PropertyDescriptor[] props = beanInfo.getPropertyDescriptors(); + for (PropertyDescriptor property : props) { + if (fieldName.equals(property.getName())) { + Method method = property.getReadMethod(); + value = method.invoke(t, new Object[]{}); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return value; + } public static XSSFWorkbook genWorkbookV2(List> rowList, String sheetName) { XSSFWorkbook workbook = new XSSFWorkbook(); From 60e792d4813f69bac11a4b523584b5d8e7c8078a Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 23 Jan 2024 14:46:29 +0800 Subject: [PATCH 059/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=B9=B6=E5=BD=92=E6=A1=A3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/timer/AutoSiAccountAndFileJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java b/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java index 646024f3d..47dd04994 100644 --- a/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java +++ b/src/com/engine/salary/timer/AutoSiAccountAndFileJob.java @@ -70,7 +70,7 @@ public class AutoSiAccountAndFileJob extends BaseCronJob { @Override public void execute() { - if (StrUtil.isNotBlank(diffToCurrentMonth) && RegularUtil.isInteger(diffToCurrentMonth)) { + if (StrUtil.isNotBlank(diffToCurrentMonth) && (RegularUtil.isInteger(diffToCurrentMonth) || "0".equals(diffToCurrentMonth))) { User user = new User(); user.setUid(1); user.setLoginid("sysadmin"); From e1ca39e8598591dd1b56728ea8b6acdeffd95e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 23 Jan 2024 15:00:46 +0800 Subject: [PATCH 060/169] =?UTF-8?q?elog=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202401230403.sql | 8 ++++++++ resource/sqlupgrade/GS/sql202401230403.sql | 8 ++++++++ resource/sqlupgrade/JC/sql202401230403.sql | 8 ++++++++ resource/sqlupgrade/Mysql/sql202401230403.sql | 6 ++++++ resource/sqlupgrade/Oracle/sql202401230403.sql | 7 +++++++ resource/sqlupgrade/PG/sql202401230403.sql | 6 ++++++ resource/sqlupgrade/SQLServer/sql202401230403.sql | 7 +++++++ resource/sqlupgrade/ST/sql202401230403.sql | 8 ++++++++ 8 files changed, 58 insertions(+) create mode 100644 resource/sqlupgrade/DM/sql202401230403.sql create mode 100644 resource/sqlupgrade/GS/sql202401230403.sql create mode 100644 resource/sqlupgrade/JC/sql202401230403.sql create mode 100644 resource/sqlupgrade/Mysql/sql202401230403.sql create mode 100644 resource/sqlupgrade/Oracle/sql202401230403.sql create mode 100644 resource/sqlupgrade/PG/sql202401230403.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202401230403.sql create mode 100644 resource/sqlupgrade/ST/sql202401230403.sql diff --git a/resource/sqlupgrade/DM/sql202401230403.sql b/resource/sqlupgrade/DM/sql202401230403.sql new file mode 100644 index 000000000..9549b4a38 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202401230403.sql @@ -0,0 +1,8 @@ +CREATE TABLE hrsa_elog_version +( + id NUMBER(38,0) primary key NOT NULL, + mainTable varchar2(255), + version NUMBER(38,0) +); +/ + diff --git a/resource/sqlupgrade/GS/sql202401230403.sql b/resource/sqlupgrade/GS/sql202401230403.sql new file mode 100644 index 000000000..9549b4a38 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202401230403.sql @@ -0,0 +1,8 @@ +CREATE TABLE hrsa_elog_version +( + id NUMBER(38,0) primary key NOT NULL, + mainTable varchar2(255), + version NUMBER(38,0) +); +/ + diff --git a/resource/sqlupgrade/JC/sql202401230403.sql b/resource/sqlupgrade/JC/sql202401230403.sql new file mode 100644 index 000000000..9549b4a38 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202401230403.sql @@ -0,0 +1,8 @@ +CREATE TABLE hrsa_elog_version +( + id NUMBER(38,0) primary key NOT NULL, + mainTable varchar2(255), + version NUMBER(38,0) +); +/ + diff --git a/resource/sqlupgrade/Mysql/sql202401230403.sql b/resource/sqlupgrade/Mysql/sql202401230403.sql new file mode 100644 index 000000000..23e6f1e06 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202401230403.sql @@ -0,0 +1,6 @@ +CREATE TABLE hrsa_elog_version ( + id bigint(0) NOT NULL, + mainTable varchar(255) NULL, + version bigint(0) NULL, + PRIMARY KEY (id) USING BTREE +) ; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202401230403.sql b/resource/sqlupgrade/Oracle/sql202401230403.sql new file mode 100644 index 000000000..e0a34b233 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202401230403.sql @@ -0,0 +1,7 @@ +CREATE TABLE hrsa_elog_version +( + id NUMBER(38,0) primary key NOT NULL, + mainTable varchar2(255), + version NUMBER(38,0) +) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202401230403.sql b/resource/sqlupgrade/PG/sql202401230403.sql new file mode 100644 index 000000000..23b66fe53 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202401230403.sql @@ -0,0 +1,6 @@ +CREATE TABLE hrsa_elog_version ( + id bigint NOT NULL, + version bigint NOT NULL, + mainTable varchar(255), + PRIMARY KEY (id) +); \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202401230403.sql b/resource/sqlupgrade/SQLServer/sql202401230403.sql new file mode 100644 index 000000000..16a1bb858 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202401230403.sql @@ -0,0 +1,7 @@ +create table hrsa_elog_version +( + id bigint primary key , + mainTable varchar(255), + version bigint +) +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202401230403.sql b/resource/sqlupgrade/ST/sql202401230403.sql new file mode 100644 index 000000000..9549b4a38 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202401230403.sql @@ -0,0 +1,8 @@ +CREATE TABLE hrsa_elog_version +( + id NUMBER(38,0) primary key NOT NULL, + mainTable varchar2(255), + version NUMBER(38,0) +); +/ + From 56bb9a5af385258cb23e18f3ca7cf796d30714e6 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 23 Jan 2024 15:08:53 +0800 Subject: [PATCH 061/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=A1=86=E5=AF=B9=E5=BA=94=E5=8F=82=E6=95=B0=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index ff5fe4727..be722d87c 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -322,7 +322,7 @@ public class SIArchivesBiz { } } List addGroups = new ArrayList<>(); - List inputItems = buildPaymentBase(user, schemeId, welfareType); + List inputItems = buildPaymentBase(user, schemeId, welfareType, welBaseDiffSign); //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 for (SearchConditionItem item : inputItems) { String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; @@ -376,7 +376,7 @@ public class SIArchivesBiz { } List addGroups = new ArrayList<>(); - List inputItems = buildPaymentBase(user, schemeId, welfareType); + List inputItems = buildPaymentBase(user, schemeId, welfareType, welBaseDiffSign); //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 for (SearchConditionItem item : inputItems) { String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; @@ -429,7 +429,7 @@ public class SIArchivesBiz { } List addGroups = new ArrayList<>(); - List inputItems = buildPaymentBase(user, schemeId, welfareType); + List inputItems = buildPaymentBase(user, schemeId, welfareType, welBaseDiffSign); //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 for (SearchConditionItem item : inputItems) { String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; @@ -466,13 +466,22 @@ public class SIArchivesBiz { * @param schemeId * @return */ - public List buildPaymentBase(User user, Long schemeId, Integer welfareType) { + public List buildPaymentBase(User user, Long schemeId, Integer welfareType, boolean welBaseDiffSign) { List inputItems = new ArrayList<>(); if (schemeId == null) { return new ArrayList<>(); } List list = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_PERSON.getValue())).collect(Collectors.toList()); + if (!welBaseDiffSign) { + List perInsuranceIdList = list.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); + List moreComList = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() + .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_COMPANY.getValue()) && !perInsuranceIdList.contains(f.getInsuranceId())).collect(Collectors.toList()); + if (moreComList.size() > 0) { + list.addAll(moreComList); + } + } + SICategoryBiz siCategoryBiz = new SICategoryBiz(); list.forEach(insuranceSchemeDetail -> { ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); From 71f90882d32d006f84b5524c264495514d84f207 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 23 Jan 2024 16:45:09 +0800 Subject: [PATCH 062/169] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=8C=BA=E5=88=86pc=E5=92=8C=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salaryBill/bo/SalaryTemplateBO.java | 1 + .../salaryBill/dto/SalaryBillAckFeedbackDTO.java | 6 ++++++ .../salaryBill/dto/SalaryTemplateBaseSetDTO.java | 6 ++++++ .../param/SalaryTemplateSaveParam.java | 5 +++++ .../entity/salaryBill/po/SalaryTemplatePO.java | 7 +++++++ .../mapper/salarybill/SalaryTemplateMapper.xml | 16 ++++++++++++++++ .../impl/SalaryBillBaseSetServiceImpl.java | 7 ++++++- .../service/impl/SalarySendServiceImpl.java | 5 +++++ .../service/impl/SalaryTemplateServiceImpl.java | 1 + .../salary/sys/constant/SalarySysConstant.java | 5 +++++ .../salary/wrapper/SalaryTemplateWrapper.java | 1 + 11 files changed, 59 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java index cd7af96ba..32fd9f0d6 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java @@ -80,6 +80,7 @@ public class SalaryTemplateBO { .ackFeedbackStatus(saveParam.getAckFeedbackStatus()?1:0) .autoAckDays(saveParam.getAutoAckDays()) .feedbackUrl(saveParam.getFeedbackUrl()) + .mobileFeedbackUrl(saveParam.getMobileFeedbackUrl()) .createTime(new Date()) .updateTime(new Date()) .creator(employeeId) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java index 340e97387..767d6ccac 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java @@ -27,6 +27,12 @@ public class SalaryBillAckFeedbackDTO { */ private String feedBackUrl; + + /** + * 移动端反馈地址 + */ + private String mobileFeedBackUrl; + /** * 超时自动确认天数 */ diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java index 3f76a30a8..47f4eb854 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java @@ -92,4 +92,10 @@ public class SalaryTemplateBaseSetDTO { * */ private String feedbackUrl; + + /** + * 移动端反馈流程地址 + * + */ + private String mobileFeedbackUrl; } diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java index 7f13c13c6..df1996e6d 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java @@ -110,6 +110,11 @@ public class SalaryTemplateSaveParam { */ private String feedbackUrl; + /** + * 移动端反馈流程地址 + */ + private String mobileFeedbackUrl; + List salaryBillItemNameSetting; public static void checkParam(SalaryTemplateSaveParam saveParam) { diff --git a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java index a428a68ed..5ffcbaf24 100644 --- a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java +++ b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java @@ -192,6 +192,13 @@ public class SalaryTemplatePO { private String feedbackUrl; + /** + * 移动端反馈流程地址 + * + */ + private String mobileFeedbackUrl; + + private Collection salarySobIds; } diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 17e371c33..07898826c 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -92,6 +92,7 @@ ack_feedback_status, auto_ack_days, feedback_url, + mobile_feedback_url, create_time, update_time, creator, @@ -534,6 +535,9 @@ feedback_url=#{feedbackUrl}, + + mobile_feedback_url=#{mobileFeedbackUrl}, + create_time=#{createTime}, @@ -636,6 +640,9 @@ feedback_url, + + mobile_feedback_url, + create_time, @@ -734,6 +741,9 @@ #{feedbackUrl}, + + #{mobileFeedbackUrl}, + #{createTime}, @@ -842,6 +852,9 @@ feedback_url, + + mobile_feedback_url, + create_time, @@ -940,6 +953,9 @@ #{feedbackUrl}, + + #{mobileFeedbackUrl}, + #{createTime}, diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java index e5f6d51d3..5cafea060 100644 --- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java @@ -100,6 +100,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) { // 2.保存反馈地址 getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedBackUrl(), SALARY_FEEDBACK_URL, "工资单反馈地址", "billSend"); + getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getMobileFeedBackUrl(), SALARY_FEEDBACK_URL_MOBILE, "移动端工资单反馈地址", "billSend"); // 3.保存自动确认时间 getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend"); } @@ -126,7 +127,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB @Override public SalaryBillAckFeedbackDTO getDefaultAckFeedbackSetting() { // 获取反馈开启状态、自动确认时长、反馈地址 - List codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL); + List codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL, SALARY_FEEDBACK_URL_MOBILE); List sysConfList = getSalarySysConfService(user).getListByCodes(codes); Map sysConfMap = SalaryEntityUtil.convert2Map(sysConfList, SalarySysConfPO::getConfKey, SalarySysConfPO::getConfValue); @@ -137,6 +138,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB defaultAckFeedBackDTO.setAckStatus("0"); defaultAckFeedBackDTO.setAutoAckDays(0); defaultAckFeedBackDTO.setFeedBackUrl("/"); + defaultAckFeedBackDTO.setMobileFeedBackUrl("/"); return defaultAckFeedBackDTO; } defaultAckFeedBackDTO.setAckStatus(ackStatus); @@ -146,6 +148,9 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB // 反馈地址 String feedbackUrl = sysConfMap.getOrDefault(SalarySysConstant.SALARY_FEEDBACK_URL, ""); defaultAckFeedBackDTO.setFeedBackUrl(feedbackUrl); + + String mobileFeedbackUrl = sysConfMap.getOrDefault(SALARY_FEEDBACK_URL_MOBILE, ""); + defaultAckFeedBackDTO.setMobileFeedBackUrl(mobileFeedbackUrl); return defaultAckFeedBackDTO; } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 20cb9f176..2a5f9b688 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -524,6 +524,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService } SalaryTemplatePO salaryTemplate = buildSalaryTemplateContent(salaryTemplateContent); + if (StringUtils.isNotBlank(salaryTemplate.getFeedbackUrl()) && StringUtils.isBlank(salaryTemplate.getMobileFeedbackUrl())) { + // 如果设置了pc反馈地址，没有设置移动端反馈地址，则移动端反馈地址默认等于pc反馈地址 + salaryTemplate.setMobileFeedbackUrl(salaryTemplate.getFeedbackUrl()); + } // 判断是否是补发 boolean isReplenish = NumberUtils.INTEGER_ONE.equals(salarySendInfo.getSalaryAcctType()); @@ -826,6 +830,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService .ackFeedbackStatus(Integer.valueOf(map.getOrDefault("ackFeedbackStatus", "0").toString())) .autoAckDays(Integer.valueOf(map.getOrDefault("autoAckDays", "0").toString())) .feedbackUrl(map.getOrDefault("feedbackUrl", "").toString()) + .feedbackUrl(map.getOrDefault("mobileFeedbackUrl", "").toString()) .name(map.getOrDefault("name", "").toString()) .salarySobId(Long.valueOf(map.getOrDefault("salarySobId", "0").toString())) .useType(Integer.valueOf(map.getOrDefault("useType", "0").toString())) diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 591261abb..df24535aa 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -217,6 +217,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate salaryTemplateNew.setAckFeedbackStatus(saveParam.getAckFeedbackStatus() ? 1 : 0); salaryTemplateNew.setAutoAckDays(saveParam.getAutoAckDays()); salaryTemplateNew.setFeedbackUrl(saveParam.getFeedbackUrl()); + salaryTemplateNew.setMobileFeedbackUrl(saveParam.getMobileFeedbackUrl()); // todo 薪资项目设置检查校验 salaryTemplateNew.setSalaryItemSetting(saveParam.getSalaryItemSetting() != null ? JSONUtil.toJsonStr(saveParam.getSalaryItemSetting()) : ""); salaryTemplateNew.setReplenishSalaryItemSetting(saveParam.getReplenishSalaryItemSetting() != null ? JSONUtil.toJsonStr(saveParam.getReplenishSalaryItemSetting()) : ""); diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index afe54d3c0..081702d22 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -96,6 +96,11 @@ public class SalarySysConstant { */ public static final String SALARY_FEEDBACK_URL = "SALARY_FEEDBACK_URL"; + /** + * 工资单反馈地址-移动端 + */ + public static final String SALARY_FEEDBACK_URL_MOBILE = "SALARY_FEEDBACK_URL_MOBILE"; + /** * 工资单查询限制 */ diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 6149b500e..22aac4134 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -199,6 +199,7 @@ public class SalaryTemplateWrapper extends Service { salaryTemplateBaseSetDTO.setAckFeedbackStatus(StringUtils.equals(defaultAckFeedback.getAckStatus(), "1")); salaryTemplateBaseSetDTO.setAutoAckDays(defaultAckFeedback.getAutoAckDays()); salaryTemplateBaseSetDTO.setFeedbackUrl(defaultAckFeedback.getFeedBackUrl()); + salaryTemplateBaseSetDTO.setMobileFeedbackUrl(defaultAckFeedback.getMobileFeedBackUrl()); } Map salaryTemplateBase = new HashMap<>(); salaryTemplateBase.put("data", salaryTemplateBaseSetDTO); From 5bf00a98aa2178c843df583abd127251315fce30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 24 Jan 2024 09:50:58 +0800 Subject: [PATCH 063/169] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/elog/util/LoggerTemplate.java | 2 +- .../salaryacct/po/SalaryAcctEmployeePO.java | 14 +++ .../engine/salary/enums/OperateTypeEnum.java | 15 ++- .../salaryacct/SalaryAcctManager.java | 1 - .../impl/SalaryAcctEmployeeServiceImpl.java | 48 ++++----- .../impl/SalaryAcctExcelServiceImpl.java | 99 ++++++++++++------- .../impl/SalaryAcctRecordServiceImpl.java | 95 +++++++++--------- .../impl/SalaryAcctResultServiceImpl.java | 60 ++++++----- 8 files changed, 192 insertions(+), 142 deletions(-) diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java index 8b5b6d377..a82021433 100644 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -240,7 +240,7 @@ public class LoggerTemplate { } context.setTempParams(null); - String employeeId = Optional.ofNullable(context.getUser()).map(User::getUID).orElse(0).toString(); + String employeeId = Optional.ofNullable(context.getUser()).map(User::getUID).orElse(0).toString(); String tenantKey = SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; String userName = Optional.ofNullable(context.getUser()).map(User::getUsername).orElse("").toString(); if (StringUtils.isEmpty(context.getOperator()) && StringUtils.isNotEmpty(employeeId)) { diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java index 7d6c82f58..55afc5d0b 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salaryacct.po; import com.engine.salary.annotation.SalaryFormulaVar; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -25,28 +26,33 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_salary_acct_emp +@ElogTransform(name = "薪资核算人员") public class SalaryAcctEmployeePO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 薪资核算的id */ + @ElogTransform(name = "核算记录id") @SalaryFormulaVar(defaultLabel = "核算记录id", labelId = 86321, dataType = "number") private Long salaryAcctRecordId; /** * 薪资账套id */ + @ElogTransform(name = "薪资账套id") @SalaryFormulaVar(defaultLabel = "薪资账套id", labelId = 86321, dataType = "number") private Long salarySobId; /** * 人员id */ + @ElogTransform(name = "人员id") @SalaryFormulaVar(defaultLabel = "人员id", labelId = 86321, dataType = "number") private Long employeeId; @@ -55,43 +61,51 @@ public class SalaryAcctEmployeePO { * * @see DataCollectionEmployeeTypeEnum */ + @ElogTransform(name = "人员类型") private Integer employeeType; /** * 个税扣缴义务人id */ + @ElogTransform(name = "个税扣缴义务人id") @SalaryFormulaVar(defaultLabel = "个税扣缴义务人id", labelId = 86321, dataType = "number") private Long taxAgentId; /** * 薪资所属月 */ + @ElogTransform(name = "薪资所属月") @SalaryFormulaVar(defaultLabel = "薪资所属月", labelId = 86321, dataType = "string") private Date salaryMonth; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; //--------条件---------- diff --git a/src/com/engine/salary/enums/OperateTypeEnum.java b/src/com/engine/salary/enums/OperateTypeEnum.java index 142abd5f7..697e1aea6 100644 --- a/src/com/engine/salary/enums/OperateTypeEnum.java +++ b/src/com/engine/salary/enums/OperateTypeEnum.java @@ -1,15 +1,20 @@ package com.engine.salary.enums; /** - * @Description: 操作类型 - * @Author: wangxiangzhong - * @Date: 2021/11/1 13:17 - */ + * 操作类型 + *

Copyright: Copyright (c) 2023

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public enum OperateTypeEnum { + READ("0", "查看"), ADD("1", "新增"), UPDATE("2", "更新"), - DELETE("4", "删除"); + DELETE("4", "删除"), + EXPORT("5", "导出"); private String value; diff --git a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java index 207bd1649..6b1943962 100644 --- a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java +++ b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java @@ -121,7 +121,6 @@ public class SalaryAcctManager extends Service { private SalaryAcctResultTempService getSalaryAcctResultTempService(User user) { return ServiceUtil.getService(SalaryAcctResultTempServiceImpl.class, user); } -// private LoggerTemplate salaryAcctRecordLoggerTemplate; private SIAccountService getSIAccountService(User user) { return ServiceUtil.getService(SIAccountServiceImpl.class, user); diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 56d4c84df..36cf1186f 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -4,7 +4,10 @@ import cn.hutool.core.date.DateUtil; import com.api.formmode.mybatis.util.SqlProxyHandle; 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.elog.util.LoggerTemplate; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO; import com.engine.salary.entity.salaryacct.dto.SalaryAcctEmployeeCountDTO; @@ -14,6 +17,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salaryacct.SalaryAcctEmployeeMapper; @@ -51,9 +55,7 @@ import java.util.stream.Collectors; **/ @Slf4j public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcctEmployeeService { - - - private SalaryAcctEmployeeMapper salaryAcctEmployeeMapper; + private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private SalaryAcctEmployeeMapper getSalaryAcctEmployeeMapper() { return MapperProxyFactory.getProxy(SalaryAcctEmployeeMapper.class); @@ -91,8 +93,6 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct return ServiceUtil.getService(TaxAgentServiceImpl.class, user); } -// private LoggerTemplate salaryAcctRecordLoggerTemplate; - private SalarySysConfMapper getSalarySysConfMapper() { return SqlProxyHandle.getProxy(SalarySysConfMapper.class); } @@ -394,15 +394,16 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct // 记录日志 -// String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员") + ":" + targetName); -// loggerContext.setNewValueList(salaryAcctEmployeePOS); -// salaryAcctRecordLoggerTemplate.write(loggerContext); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员") + ":" + targetName); + loggerContext.setNewValueList(salaryAcctEmployeePOS); + salaryAcctRecordLoggerTemplate.write(loggerContext); } @Override @@ -460,15 +461,16 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "薪资账套不存在或已被删除")); } // 记录日志 -// String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员") + ":" + targetName); -// loggerContext.setOldValueList(salaryAcctEmployeePOS); -// salaryAcctRecordLoggerTemplate.write(loggerContext); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员") + ":" + targetName); + loggerContext.setOldValueList(salaryAcctEmployeePOS); + salaryAcctRecordLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 8840d9302..0626e4aa2 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -5,8 +5,11 @@ import com.cloudstore.dev.api.util.Util_DataCache; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.component.WeaTableColumnGroup; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SalaryItemConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO; @@ -24,7 +27,9 @@ import com.engine.salary.entity.salarysob.dto.SalarySobItemAggregateDTO; import com.engine.salary.entity.salarysob.po.SalarySobEmpFieldPO; import com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO; import com.engine.salary.entity.salarysob.po.SalarySobItemPO; +import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salaryaccounting.LockStatusEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctResultDataSourceEnum; @@ -38,6 +43,7 @@ import com.engine.salary.sys.enums.OpenEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.JsonUtil; +import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.excel.ExcelParseHelper; @@ -81,12 +87,16 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; **/ @Slf4j public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExcelService { - + private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private SalaryAcctRecordService getSalaryAcctRecordService(User user) { return (SalaryAcctRecordService) ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user); } + private SalarySobService getSalarySobService(User user) { + return ServiceUtil.getService(SalarySobServiceImpl.class, user); + } + private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) { return (SalaryAcctEmployeeService) ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user); } @@ -237,7 +247,20 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 3.表数据 List> lists = convert2ExcelRow(salaryAcctEmployees); rows.addAll(lists); -// return ExcelUtil.genWorkbookV2(rows, sheetName); + + // 记录日志 + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); + SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员") + ":" + targetName); + salaryAcctRecordLoggerTemplate.write(loggerContext); + return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } @@ -289,10 +312,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc //判断是否按照自定义字段导出表头 List finalWeaTableColumns = new ArrayList<>(); - if (queryParam.getSalaryItemIds() != null ) { + if (queryParam.getSalaryItemIds() != null) { //获取人员基本信息字段（汇总） Collection> empFieldList = getSalarySobItemWrapper(user).empFieldList(); - List empFieldIdList= new ArrayList<>(); + List empFieldIdList = new ArrayList<>(); empFieldList.forEach(f -> empFieldIdList.add(f.get("id"))); // 必须选择导出所需的薪资项目 if (CollectionUtils.isEmpty(queryParam.getSalaryItemIds())) { @@ -311,7 +334,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc columnGroupItem.setChildren(childrenColumns); finalWeaTableColumns.add(columnGroupItem); } - } else if (empFieldIdList.contains(tableColumn.getColumn()) || headerRangeList.contains(tableColumn.getColumn())){ + } else if (empFieldIdList.contains(tableColumn.getColumn()) || headerRangeList.contains(tableColumn.getColumn())) { finalWeaTableColumns.add(columnGroupItem); } @@ -334,12 +357,12 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) { total = true; Map sumRow = getSalaryAcctResultService(user).sumRow(queryParam); - sumRow.forEach((k,v) -> { + sumRow.forEach((k, v) -> { if (NumberUtils.isCreatable(v.toString())) { - sumRow.put(k,new BigDecimal(v.toString())); + sumRow.put(k, new BigDecimal(v.toString())); } }); - if(sumRow !=null){ + if (sumRow != null) { sumRow.put("taxAgentName", "总计"); resultMapList.add(sumRow); } @@ -354,7 +377,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc for (WeaTableColumnGroup weaTableColumn : headerColumnGroup) { String fieldType = (String) map.getOrDefault(weaTableColumn.getColumn().toString() + DATA_TYPE_SUFFIX, StringUtils.EMPTY); if (StringUtils.equals("number", fieldType)) { - row.add(new BigDecimal(StringUtils.isBlank(map.get(weaTableColumn.getColumn()).toString()) ? "0" :map.get(weaTableColumn.getColumn()).toString())); + row.add(new BigDecimal(StringUtils.isBlank(map.get(weaTableColumn.getColumn()).toString()) ? "0" : map.get(weaTableColumn.getColumn()).toString())); } else { row.add(map.getOrDefault(weaTableColumn.getColumn(), StringUtils.EMPTY)); } @@ -380,7 +403,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc SalaryAcctRecordPO byId = getSalaryAcctRecordService(user).getById(salaryAcctRecordPO.getId()); boolean isBackCalc = Objects.equals(byId.getBackCalcStatus(), 1); // 查询薪资账套下的薪资项目+员工信息字段 - SalarySobItemAggregateDTO salarySobItemAggregateDTO = getSalarySobItemService(user).getAggregateWithItemHideBySalarySobId(salaryAcctRecordPO.getSalarySobId(),isBackCalc); + SalarySobItemAggregateDTO salarySobItemAggregateDTO = getSalarySobItemService(user).getAggregateWithItemHideBySalarySobId(salaryAcctRecordPO.getSalarySobId(), isBackCalc); // 构建薪资核算结果列表表头 List columnList = SalaryAcctResultBO.buildTableColumns(salarySobItemAggregateDTO, ListUtils.emptyIfNull(salaryAcctRecordPO.getLockSalaryItemIds())); // 获取固定列头数 @@ -450,27 +473,27 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc SalaryAcctResultBO.sortItem(salarySobItemPOMap); // 根据账套分组封装薪资项目的值 List itemsByGroup = new ArrayList<>(); - for(SalarySobItemGroupPO groupPO : salarySobItemGroupPOS){ - List groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(),Collections.emptyList()); + for (SalarySobItemGroupPO groupPO : salarySobItemGroupPOS) { + List groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(), Collections.emptyList()); List items = groupItems.stream() .map(salarySobItemPO -> SalaryAcctImportFieldDTO.ImportFieldDTO.builder() - .salaryItemId(salarySobItemPO.getSalaryItemId()) - .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)) - .dataType(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getDataType).orElse(SalaryDataTypeEnum.NUMBER.getValue())) - .build()) + .salaryItemId(salarySobItemPO.getSalaryItemId()) + .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)) + .dataType(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getDataType).orElse(SalaryDataTypeEnum.NUMBER.getValue())) + .build()) .collect(Collectors.toList()); itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder() .salarySobItemGroupId(groupPO.getId()) .salarySobItemGroupName(groupPO.getName()) .salaryItems(items) - .sortedIndex(groupPO.getSortedIndex()).build() ); + .sortedIndex(groupPO.getSortedIndex()).build()); } // 未分类 List noGroupItems = salarySobItemPOMap.getOrDefault(0L, Collections.emptyList()); - if(CollectionUtils.isNotEmpty(noGroupItems)){ + if (CollectionUtils.isNotEmpty(noGroupItems)) { List items = noGroupItems.stream() - .map(salarySobItemPO ->SalaryAcctImportFieldDTO.ImportFieldDTO.builder() + .map(salarySobItemPO -> SalaryAcctImportFieldDTO.ImportFieldDTO.builder() .salaryItemId(salarySobItemPO.getSalaryItemId()) .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)) .dataType(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getDataType).orElse(SalaryDataTypeEnum.NUMBER.getValue())) @@ -510,7 +533,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // .collect(Collectors.toList()); // 缓存勾选 String cacheKey = user.getUID() + SalaryItemConstant.RESULT_IMPORT_FIELD_SIGN; - String cacheValue = (String)Util_DataCache.getObjVal(cacheKey); + 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(); @@ -541,8 +564,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc SalaryAcctResultBO.sortItem(salarySobItemPOMap); // 根据账套分组封装薪资项目的值 List itemsByGroup = new ArrayList<>(); - for(SalarySobItemGroupPO groupPO : salarySobItemGroupPOS){ - List groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(),Collections.emptyList()); + for (SalarySobItemGroupPO groupPO : salarySobItemGroupPOS) { + List groupItems = salarySobItemPOMap.getOrDefault(groupPO.getId(), Collections.emptyList()); List items = groupItems.stream() .map(salarySobItemPO -> SalaryAcctImportFieldDTO.ImportFieldDTO.builder() .salaryItemId(salarySobItemPO.getSalaryItemId()) @@ -554,13 +577,13 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc .salarySobItemGroupId(groupPO.getId()) .salarySobItemGroupName(groupPO.getName()) .salaryItems(items) - .sortedIndex(groupPO.getSortedIndex()).build() ); + .sortedIndex(groupPO.getSortedIndex()).build()); } // 未分类 List noGroupItems = salarySobItemPOMap.getOrDefault(0L, Collections.emptyList()); - if(CollectionUtils.isNotEmpty(noGroupItems)){ + if (CollectionUtils.isNotEmpty(noGroupItems)) { List items = noGroupItems.stream() - .map(salarySobItemPO ->SalaryAcctImportFieldDTO.ImportFieldDTO.builder() + .map(salarySobItemPO -> SalaryAcctImportFieldDTO.ImportFieldDTO.builder() .salaryItemId(salarySobItemPO.getSalaryItemId()) .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)) .build()) @@ -574,7 +597,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } // 缓存勾选 String cacheKey = user.getUID() + SalaryItemConstant.RESULT_EXPORT_FIELD_SIGN; - String cacheValue = (String)Util_DataCache.getObjVal(cacheKey); + 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(); @@ -586,7 +609,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // ValidUtil.doValidator(param); // 从缓存中获取所选的薪资项目 String cacheKey = user.getUID() + SalaryItemConstant.RESULT_IMPORT_FIELD_SIGN; - String cacheValue = (String)Util_DataCache.getObjVal(cacheKey); + String cacheValue = (String) Util_DataCache.getObjVal(cacheKey); List checkItems = JsonUtil.parseList(cacheValue, Long.class) == null ? new ArrayList<>() : JsonUtil.parseList(cacheValue, Long.class); // 必须选择导入模板所需的薪资项目 if (CollectionUtils.isEmpty(checkItems)) { @@ -691,7 +714,6 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } - @Override public XSSFWorkbook exportComparisonResult(SalaryComparisonResultQueryParam queryParam) { ValidUtil.doValidator(queryParam); @@ -827,7 +849,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 查询薪资核算所用的薪资账套的员工信息字段 List salarySobEmpFieldPOS = getSalarySobEmpFieldService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); List salarySobEmpFieldDTOS = new SalarySobItemAggregateBO().buildEmpField(salarySobEmpFieldPOS); - salarySobEmpFieldDTOS.stream().forEach(empField -> finalWeaTableColumns.add(new WeaTableColumnGroup("150", SalaryI18nUtil.getI18nLabel(0, empField.getFieldName()), SalaryI18nUtil.getI18nLabel(0, empField.getFieldName())))); + salarySobEmpFieldDTOS.stream().forEach(empField -> finalWeaTableColumns.add(new WeaTableColumnGroup("150", SalaryI18nUtil.getI18nLabel(0, empField.getFieldName()), SalaryI18nUtil.getI18nLabel(0, empField.getFieldName())))); for (WeaTableColumnGroup tableColumn : weaTableColumns) { WeaTableColumnGroup columnGroupItem = (WeaTableColumnGroup) tableColumn; if (columnGroupItem.getChildren() != null) { @@ -992,16 +1014,16 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // List headers = ExcelSupport.getSheetHeader(sheet, 0); List headers; // if (StringUtils.equals("importSalaryAcctResult", importType)) { - headers = ExcelSupport.getSheetHeader(sheet, 1); + headers = ExcelSupport.getSheetHeader(sheet, 1); // } else { // headers = ExcelSupport.getSheetHeader(sheet, 0); // } - // 处理数值 + // 处理数值 // List> data = ExcelParseHelper.parse2Map(sheet, 1); List> data; // if (StringUtils.equals("importSalaryAcctResult", importType)) { - data = ExcelParseHelper.parse2Map(sheet, 2, 1); + data = ExcelParseHelper.parse2Map(sheet, 2, 1); // } else { // data = ExcelParseHelper.parse2Map(sheet, 1); // } @@ -1248,7 +1270,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc getSalaryComparisonResultService(user).deleteBySalaryAcctRecordIds(Collections.singleton(salaryAcctRecordId)); if (CollectionUtils.isNotEmpty(excelAcctResults)) { excelAcctResults.stream().forEach(result -> { - if(StringUtils.isEmpty(result.getResultValue())){ + if (StringUtils.isEmpty(result.getResultValue())) { result.setResultValue(" "); } }); @@ -1282,7 +1304,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } } SalarySysConfPO autoLock = getSalarySysConfService(user).getOneByCode(SalarySysConstant.EDIT_IMPORT_AUTO_LOCK); - if(autoLock != null && StringUtils.equals(autoLock.getConfValue(),"1")){ + if (autoLock != null && StringUtils.equals(autoLock.getConfValue(), "1")) { // 导入的列都自动锁定 SalaryAcctResultUpdateLockStatusParam updateLockStatusParam = SalaryAcctResultUpdateLockStatusParam.builder() .salaryItemIds(excelSalaryItemIds) @@ -1305,7 +1327,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } /** - * 存储薪资核算结果数据来源日志 + * 存储薪资核算结果数据来源日志 + * * @param salaryAcctResults */ private void handleSalaryAcctResultLog(List salaryAcctResults) { @@ -1315,14 +1338,14 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc List salaryAcctResultList = getSalaryAcctResultService(user).listByAcctEmployeeIdsAndSalaryItemIds(salaryAcctEmpIds, salaryItemIds); Long uid = Long.valueOf(user.getUID()); List needInsertList = SalaryAcctResultLogBO.buildSalaryAcctResultLog(salaryAcctResultList, uid, SalaryAcctResultDataSourceEnum.IMPORT); - if(CollectionUtils.isNotEmpty(needInsertList)){ + if (CollectionUtils.isNotEmpty(needInsertList)) { getSalaryAcctResultLogService(user).batchInsert(needInsertList); } } /** - * @description * @return void + * @description * @author Harryxzy * @date 2022/12/26 22:36 */ @@ -1330,7 +1353,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc Map> deleteMap = SalaryEntityUtil.group2Map(deleteResults, po -> po.getSalaryAcctEmpId() + "-" + po.getSalaryItemId()); salaryAcctResults.stream().forEach(result -> { List salaryAcctResultPOS = deleteMap.get(result.getSalaryAcctEmpId() + "-" + result.getSalaryItemId()); - if(salaryAcctResultPOS != null && salaryAcctResultPOS.size() > 0 ){ + if (salaryAcctResultPOS != null && salaryAcctResultPOS.size() > 0) { result.setOriginResultValue(salaryAcctResultPOS.get(0).getOriginResultValue()); } }); diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index d6924e489..1d3e300ef 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -4,9 +4,9 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.common.LocalDateRange; -import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.entity.datacollection.DataCollectionEmployee; -import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.entity.salaryBill.po.SalarySendPO; import com.engine.salary.entity.salaryacct.bo.SalaryAcctRecordBO; import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam; @@ -15,8 +15,8 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; -import com.engine.salary.entity.salarysob.po.SalarySobItemPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -35,14 +35,11 @@ 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 dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import weaver.hrm.User; -import java.time.YearMonth; import java.util.*; import java.util.stream.Collectors; @@ -55,7 +52,7 @@ import java.util.stream.Collectors; * @version 1.0 **/ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRecordService { - + private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private SalaryAcctRecordMapper getSalaryAcctRecordMapper() { return MapperProxyFactory.getProxy(SalaryAcctRecordMapper.class); @@ -303,15 +300,16 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 初始化薪资核算人员 getSalaryAcctEmployeeService(user).initBySalaryAcctRecord(salaryAcctRecordPO); // 记录日志 -// String targetName = getLogTargetNameById(salaryAcctRecordPO.getId(), tenantKey); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算") + ": " + targetName); -// loggerContext.setNewValues(salaryAcctRecordPO); -// salaryAcctRecordLoggerTemplate.write(loggerContext); + String targetName = getLogTargetNameById(salaryAcctRecordPO.getId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算") + ": " + targetName); + loggerContext.setNewValues(salaryAcctRecordPO); + salaryAcctRecordLoggerTemplate.write(loggerContext); // 返回薪资核算记录id return salaryAcctRecordPO.getId(); } @@ -534,18 +532,19 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe } // 记录日志 -// salaryAcctRecordPOS.forEach(salaryAcctRecordPO -> { -// SalarySobPO salarySobPO = salarySobPOMap.get(salaryAcctRecordPO.getSalarySobId()); -// String targetName = salarySobPO.getName() + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算") + ":" + targetName); -// loggerContext.setNewValues(salaryAcctRecordPO); -// salaryAcctRecordLoggerTemplate.write(loggerContext); -// }); + salaryAcctRecordPOS.forEach(salaryAcctRecordPO -> { + SalarySobPO salarySobPO = salarySobPOMap.get(salaryAcctRecordPO.getSalarySobId()); + String targetName = salarySobPO.getName() + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算") + ":" + targetName); + loggerContext.setNewValues(salaryAcctRecordPO); + salaryAcctRecordLoggerTemplate.write(loggerContext); + }); } @Override @@ -577,15 +576,16 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 记录日志 -// String targetName = getLogTargetNameById(salaryAcctRecordId); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档") + ": " + targetName); -// loggerContext.setNewValues(salaryAcctRecordPO); -// salaryAcctRecordLoggerTemplate.write(loggerContext); + String targetName = getLogTargetNameById(salaryAcctRecordId); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档") + ": " + targetName); + loggerContext.setNewValues(salaryAcctRecordPO); + salaryAcctRecordLoggerTemplate.write(loggerContext); } @Override @@ -626,15 +626,16 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // salaryAcctRecordPO.setUpdateTime(new Date()); // getSalaryAcctRecordMapper().updateIgnoreNull(salaryAcctRecordPO); // 记录日志 -// String targetName = getLogTargetNameById(salaryAcctRecordPO.getId(), tenantKey); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98820, "重新核算")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98820, "重新核算") + ": " + targetName); -// loggerContext.setNewValues(salaryAcctRecordPO); -// salaryAcctRecordLoggerTemplate.write(loggerContext); + String targetName = getLogTargetNameById(salaryAcctRecordPO.getId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98820, "重新核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98820, "重新核算") + ": " + targetName); + loggerContext.setNewValues(salaryAcctRecordPO); + salaryAcctRecordLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 5369fea9e..fef331259 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -4,7 +4,10 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.cache.SalaryCacheKey; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO; @@ -23,9 +26,10 @@ import com.engine.salary.entity.salarysob.dto.*; import com.engine.salary.entity.salarysob.po.*; import com.engine.salary.entity.taxagent.po.TaxAgentAdminPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; -import com.engine.salary.enums.common.FilterEnum; import com.engine.salary.enums.UserStatusEnum; +import com.engine.salary.enums.common.FilterEnum; import com.engine.salary.enums.salaryaccounting.LockStatusEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctResultDataSourceEnum; @@ -82,6 +86,7 @@ import java.util.stream.Collectors; **/ @Slf4j public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctResultService { + private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private EncryptUtil encryptUtil = new EncryptUtil(); private SalaryAcctResultMapper getSalaryAcctResultMapper() { @@ -145,7 +150,6 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe private SalaryAcctResultTempService getSalaryAcctResultTempService(User user) { return ServiceUtil.getService(SalaryAcctResultTempServiceImpl.class, user); } -// private LoggerTemplate salaryAcctRecordLoggerTemplate; private SIAccountService getSIAccountService(User user) { return ServiceUtil.getService(SIAccountServiceImpl.class, user); @@ -355,7 +359,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe //其他条件 List otherConditions = queryParam.getOtherConditions(); - if(CollectionUtils.isNotEmpty(otherConditions)){ + if (CollectionUtils.isNotEmpty(otherConditions)) { List items = SalaryEntityUtil.properties(otherConditions, SalaryAcctResultQueryParam.OtherCondition::getItemId, Collectors.toList()); List list = listBySalaryAcctRecordIdsAndSalaryItemIds(Collections.singletonList(queryParam.getSalaryAcctRecordId()), items); for (int i = 0; i < otherConditions.size(); i++) { @@ -646,21 +650,22 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe saveSalaryAcctResultLog(salaryAcctResultPOSOld, salaryAcctResultPOS); // 查询操作日志的targetName -// String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(salaryAcctEmployeePO.getSalaryAcctRecordId()); - // 查询人员信息 -// DataCollectionEmployee simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(salaryAcctEmployeePO.getEmployeeId()); - // 查询个税扣缴义务人 -// TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(salaryAcctEmployeePO.getTaxAgentId()); - // 记录日志 -// String operateDesc = simpleEmployee.getUsername() + "(" + Optional.ofNullable(taxAgentPO).map(TaxAgentPO::getName).orElse(StringUtils.EMPTY) + ")"; -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(salaryAcctEmployeePO.getSalaryAcctRecordId())); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); -// loggerContext.setNewValueList(Lists.newArrayList(salaryAcctResultPOS)); -// salaryAcctRecordLoggerTemplate.write(loggerContext); + String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(salaryAcctEmployeePO.getSalaryAcctRecordId()); +// 查询人员信息 + DataCollectionEmployee simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(salaryAcctEmployeePO.getEmployeeId()); +// 查询个税扣缴义务人 + TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(salaryAcctEmployeePO.getTaxAgentId()); +// 记录日志 + String operateDesc = simpleEmployee.getUsername() + "(" + Optional.ofNullable(taxAgentPO).map(TaxAgentPO::getName).orElse(StringUtils.EMPTY) + ")"; + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryAcctEmployeePO.getSalaryAcctRecordId())); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); + loggerContext.setNewValueList(Lists.newArrayList(salaryAcctResultPOS)); + salaryAcctRecordLoggerTemplate.write(loggerContext); } /** @@ -856,14 +861,15 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe }.start(); // 记录日志 // 查询操作日志的targetName -// String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(calculateParam.getSalaryAcctRecordId()); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(calculateParam.getSalaryAcctRecordId())); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); -// salaryAcctRecordLoggerTemplate.write(loggerContext); + String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(calculateParam.getSalaryAcctRecordId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(calculateParam.getSalaryAcctRecordId())); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); + salaryAcctRecordLoggerTemplate.write(loggerContext); } catch (Exception e) { log.info("薪资核算出错：{}", e.getMessage(), e); // throw new SalaryRunTimeException(e); @@ -1191,7 +1197,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe batchSave(needInsertList); // 报表入库前先删除 - getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(param.getIdList(), Collections.singletonList(param.getSalaryItemId()) ); + getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(param.getIdList(), Collections.singletonList(param.getSalaryItemId())); getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); } From 4da07b9e8071a3229819860fa5ebe9aa4552b57b Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 24 Jan 2024 14:35:55 +0800 Subject: [PATCH 064/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E3=80=81=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=EF=BC=8C=E5=9F=BA=E6=95=B0=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E6=9D=83=EF=BC=8C=E5=8F=B0=E8=B4=A6=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4?= =?UTF-8?q?=E4=B9=89=E5=8A=A1=E4=BA=BA=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryBill/dto/SalaryTemplateListDTO.java | 3 +++ .../mapper/salarybill/SalaryTemplateMapper.xml | 9 ++++++--- .../salary/service/impl/SIAccountServiceImpl.java | 4 +++- .../salary/service/impl/SIArchivesServiceImpl.java | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java index 60182ae3f..887f36905 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java @@ -54,4 +54,7 @@ public class SalaryTemplateListDTO { @SalaryTableColumn(text = "备注", width = "20%", column = "description") @TableTitle(title = "备注", dataIndex = "description", key = "description") private String description; + + // 薪资账套id + private Long salarySobId; } diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 17e371c33..9912f302d 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -366,7 +366,8 @@ t.replenish_name as replenishName, s.name as salarysob, t.use_type as useType, - t.description + t.description, + t.salary_sob_id from hrsa_salary_template t left join hrsa_salary_sob s on t.salary_sob_id = s.id where t.delete_type = 0 @@ -398,7 +399,8 @@ t.replenish_name as replenishName, s.name as salarysob, t.use_type as useType, - t.description + t.description, + t.salary_sob_id from hrsa_salary_template t left join hrsa_salary_sob s on t.salary_sob_id = s.id where t.delete_type = 0 @@ -430,7 +432,8 @@ t.replenish_name as replenishName, s.name as salarysob, t.use_type as useType, - t.description + t.description, + t.salary_sob_id from hrsa_salary_template t left join hrsa_salary_sob s on t.salary_sob_id = s.id where t.delete_type = 0 diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 43168124a..8b8da3b77 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -232,6 +232,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { Long employeeId = (long) user.getUID(); Map datas = new HashMap<>(); + List paymentOrganizationIds = queryParam.getTaxAgents(); // 分权逻辑 Boolean needAuth = getTaxAgentService(user).isNeedAuth((long) user.getUID()); if (needAuth) { @@ -240,7 +241,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (CollectionUtils.isEmpty(taxAgents)) { //防止普通用户查询 queryParam.setTaxAgents(Collections.singletonList(-1L)); - } else { + } else if (paymentOrganizationIds != null && paymentOrganizationIds.size() > 0){ + taxAgents.retainAll(paymentOrganizationIds); queryParam.setTaxAgents(taxAgents); } } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 8738c66f9..071dde24e 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -1159,6 +1159,20 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService public PageInfo historyListByEmployeeIdAndOperator(SIArchiveBaseHistoryListParam param) { List adjustHistoryDTOS = siArchivesBiz.getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); + + // 分权逻辑 + Boolean needAuth = getTaxAgentService(user).isNeedAuth((long) user.getUID()); + if (needAuth) { + Collection taxAgentPOS = getTaxAgentService(user).listAllTaxAgents((long) user.getUID()); + List taxAgents = taxAgentPOS.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(taxAgents)) { + //防止普通用户查询 + adjustHistoryDTOS = new ArrayList<>(); + } else { + adjustHistoryDTOS = adjustHistoryDTOS.stream().filter(f -> taxAgents.contains(f.getPaymentOrganization())).collect(Collectors.toList()); + } + } + adjustHistoryDTOS.forEach(f -> { if (StringUtils.isNotBlank(f.getPaymentScope())) { if(f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_PERSON.getValue().toString())) { From 6fc8d8fdeef90a088075d009f22cee737bdca9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 25 Jan 2024 11:38:38 +0800 Subject: [PATCH 065/169] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BE=BE=E6=A2=A6?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIAccountBiz.java | 2 +- src/com/engine/salary/biz/SIArchivesBiz.java | 2 +- .../entity/agency/bo/PaymentAgencyBO.java | 2 +- .../report/bo/SalaryAcctResultReportBO.java | 2 +- .../salaryacct/bo/SalaryAcctResultLogBO.java | 2 +- .../salaryarchive/bo/SalaryArchiveBO.java | 2 +- .../bo/SalaryArchiveExcelBO.java | 2 +- .../entity/salaryitem/bo/SalaryItemBO.java | 2 +- .../entity/salaryitem/bo/SysSalaryItemBO.java | 2 +- .../salarysob/bo/SalarySobBackItemBO.java | 2 +- .../salarysob/bo/SalarySobDuplicateBO.java | 2 +- .../entity/salarysob/bo/SalarySobItemBO.java | 2 +- .../bo/InsuranceArchivesBaseInfoBO.java | 2 +- .../entity/sicategory/bo/ICategoryBO.java | 2 +- .../salary/entity/taxagent/bo/TaxAgentBO.java | 2 +- .../taxdeclaration/bo/TaxDeclarationBO.java | 2 +- .../SalaryStatisticsDimensionServiceImpl.java | 2 +- .../SalaryStatisticsEchartsServiceImpl.java | 2 +- .../impl/SalaryStatisticsItemServiceImpl.java | 2 +- .../impl/SalaryStatisticsPushServiceImpl.java | 2 +- .../SalaryStatisticsReportServiceImpl.java | 2 +- .../impl/AttendQuoteDataServiceImpl.java | 2 +- .../service/impl/ExtEmpServiceImpl.java | 2 +- .../service/impl/SIAccountServiceImpl.java | 2 +- .../service/impl/SIBalanceServiceImpl.java | 2 +- .../impl/SICompensationServiceImpl.java | 2 +- .../service/impl/SISchemeServiceImpl.java | 2 +- .../impl/SalaryAcctExcelServiceImpl.java | 2 +- .../impl/SalaryAcctRecordServiceImpl.java | 2 +- .../impl/SalaryAcctResultServiceImpl.java | 2 +- .../impl/SalaryArchiveServiceImpl.java | 2 +- .../impl/SalaryBillBaseSetServiceImpl.java | 2 +- .../impl/SalaryBillItemNameServiceImpl.java | 2 +- .../impl/SalaryEmployeeServiceImpl.java | 2 +- .../impl/SalaryFormulaServiceImpl.java | 2 +- .../service/impl/SalarySendServiceImpl.java | 2 +- .../impl/SalarySobExtRangeServiceImpl.java | 2 +- .../impl/SalarySobItemServiceImpl.java | 2 +- .../service/impl/SalarySobServiceImpl.java | 2 +- .../impl/SalaryTemplateServiceImpl.java | 2 +- .../impl/TaxAgentAdminServiceImpl.java | 2 +- .../service/impl/TaxAgentBaseServiceImpl.java | 2 +- .../service/impl/TaxAgentEmpServiceImpl.java | 2 +- .../impl/TaxAgentManageRangeServiceImpl.java | 2 +- .../impl/SalarySysConfServiceImpl.java | 2 +- .../timer/SyncTaxAgentEmp2SobEmpJob.java | 2 +- .../engine/salary/util/SalaryTokenUtil.java | 2 +- .../engine/salary/util/db/IdGenerator.java | 46 +++++++++++++++++++ .../salary/wrapper/SalarySobWrapper.java | 2 +- 49 files changed, 94 insertions(+), 48 deletions(-) create mode 100644 src/com/engine/salary/util/db/IdGenerator.java diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 7c661b682..2fba1d08f 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -50,7 +50,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.wbi.util.StringUtil; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.math.NumberUtils; diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index be722d87c..2639788c3 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -51,7 +51,7 @@ import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.wrapper.TaxAgentWrapper; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; diff --git a/src/com/engine/salary/entity/agency/bo/PaymentAgencyBO.java b/src/com/engine/salary/entity/agency/bo/PaymentAgencyBO.java index 0fbe29e78..25956b123 100644 --- a/src/com/engine/salary/entity/agency/bo/PaymentAgencyBO.java +++ b/src/com/engine/salary/entity/agency/bo/PaymentAgencyBO.java @@ -4,7 +4,7 @@ import com.engine.salary.entity.agency.dto.PaymentAgencyFormDTO; import com.engine.salary.entity.agency.dto.PaymentAgencyListDTO; import com.engine.salary.entity.agency.po.PaymentAgencyPO; import com.engine.salary.enums.sicategory.DeleteTypeEnum; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import java.time.LocalDateTime; diff --git a/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java b/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java index 06cb10a8a..5b6c4d2c9 100644 --- a/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java +++ b/src/com/engine/salary/entity/report/bo/SalaryAcctResultReportBO.java @@ -6,7 +6,7 @@ import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; import com.engine.salary.entity.salaryacct.param.SalaryAcctResultSaveParam; import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultTempPO; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultLogBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultLogBO.java index 985880f3c..f8270bb5b 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultLogBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultLogBO.java @@ -3,7 +3,7 @@ package com.engine.salary.entity.salaryacct.bo; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultLogPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.enums.salaryaccounting.SalaryAcctResultDataSourceEnum; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.lang3.math.NumberUtils; import java.util.ArrayList; diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java index 552856821..62d9196a6 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java @@ -18,7 +18,7 @@ import com.engine.salary.enums.taxagent.TaxAgentEmpChangeTypeEnum; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java index 5a72e9641..02eb78dda 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java @@ -25,7 +25,7 @@ import com.engine.salary.util.excel.ExcelComment; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java index c11c58954..1048360fa 100644 --- a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java +++ b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java @@ -257,7 +257,7 @@ public class SalaryItemBO { */ public static SalaryItemPO convert2SalaryItemPO(SalaryItemSaveParam saveParam, Long employeeId) { Date now = new Date(); - long id = dm.jdbc.util.IdGenerator.generate(); + long id = com.engine.salary.util.db.IdGenerator.generate(); SalaryItemPO salaryItemPO = SalaryItemPO.builder() .id(id) .code(IdGenerator.getUUID()) diff --git a/src/com/engine/salary/entity/salaryitem/bo/SysSalaryItemBO.java b/src/com/engine/salary/entity/salaryitem/bo/SysSalaryItemBO.java index 544550acf..6defd200c 100644 --- a/src/com/engine/salary/entity/salaryitem/bo/SysSalaryItemBO.java +++ b/src/com/engine/salary/entity/salaryitem/bo/SysSalaryItemBO.java @@ -10,7 +10,7 @@ import com.engine.salary.enums.SalarySystemTypeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum; import com.engine.salary.util.SalaryI18nUtil; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java index e4348149e..93447575c 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobBackItemBO.java @@ -8,7 +8,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; import com.engine.salary.entity.salarysob.po.SalarySobDefaultBackItemPO; import com.engine.salary.util.SalaryEntityUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections.CollectionUtils; import java.util.Collections; diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java index 28f6b8b69..6a64f4912 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java @@ -4,7 +4,7 @@ import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.salarysob.po.*; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.AllArgsConstructor; import lombok.Data; import org.apache.commons.collections4.CollectionUtils; diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java index 3e2513908..0b4ae442d 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobItemBO.java @@ -7,7 +7,7 @@ import com.engine.salary.enums.sicategory.DeleteTypeEnum; import com.engine.salary.util.SalaryEntityUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.Data; import lombok.experimental.Accessors; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBaseInfoBO.java b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBaseInfoBO.java index 8c22ae58f..15a58cef6 100644 --- a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBaseInfoBO.java +++ b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBaseInfoBO.java @@ -7,7 +7,7 @@ import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.taxagent.TaxAgentEmpChangeTypeEnum; import com.engine.salary.util.SalaryEntityUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/com/engine/salary/entity/sicategory/bo/ICategoryBO.java b/src/com/engine/salary/entity/sicategory/bo/ICategoryBO.java index ae0af9555..8bf7052ac 100644 --- a/src/com/engine/salary/entity/sicategory/bo/ICategoryBO.java +++ b/src/com/engine/salary/entity/sicategory/bo/ICategoryBO.java @@ -5,7 +5,7 @@ import com.engine.salary.entity.sicategory.dto.ICategoryFormDTO; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.enums.sicategory.DataTypeEnum; import com.engine.salary.util.SalaryEnumUtil; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import java.util.Date; import java.util.Objects; diff --git a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java index 5eb60c561..7078723af 100644 --- a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java +++ b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java @@ -27,7 +27,7 @@ import com.engine.salary.util.page.Column; import com.engine.salary.util.page.PageInfo; import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java index 4fe0d32c3..e9500c680 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java @@ -22,7 +22,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.Data; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java index c855e0037..d62cdd1b3 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsDimensionServiceImpl.java @@ -21,7 +21,7 @@ import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEchartsServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEchartsServiceImpl.java index 6828d2899..d09400752 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEchartsServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEchartsServiceImpl.java @@ -11,7 +11,7 @@ import com.engine.salary.report.service.SalaryStatisticsEchartsService; import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java index ab3600c5e..41b3fb90b 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java @@ -13,7 +13,7 @@ import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java index 97b67c878..82156264d 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java @@ -32,7 +32,7 @@ import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 3f9745f11..368918f4c 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -37,7 +37,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index e71480f4a..8e9f4282a 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -55,7 +55,7 @@ import com.engine.salary.util.valid.ValidUtil; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java index dcb3b5f1f..cf833a66f 100644 --- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java @@ -27,7 +27,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index cbed96243..c5ce7e289 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -74,7 +74,7 @@ import com.engine.salary.wrapper.SalaryFormulaWrapper; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.mzlion.core.utils.BeanUtils; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Sheet; diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java index 80dd92f67..28387d55c 100644 --- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java @@ -34,7 +34,7 @@ import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.hrm.User; diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java index 8d0e1f579..9a97d7ce5 100644 --- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java @@ -33,7 +33,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.Column; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.springframework.beans.BeanUtils; import weaver.hrm.User; diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index da2c8b0ae..19a670559 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -58,7 +58,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 8840d9302..766ebc9f2 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -49,7 +49,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.wbi.util.Util; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index d6924e489..9f88c40cb 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -35,7 +35,7 @@ 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 dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 5369fea9e..6fcd32486 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -54,7 +54,7 @@ import com.google.common.collect.Sets; import com.weaver.util.threadPool.ThreadPoolUtil; import com.weaver.util.threadPool.constant.ModulePoolEnum; import com.weaver.util.threadPool.entity.LocalRunnable; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 2ab7a1bdd..e4d2fe9eb 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -48,7 +48,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.time.DateUtils; diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java index e5f6d51d3..6739ddac0 100644 --- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java @@ -22,7 +22,7 @@ import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.JsonUtil; import com.engine.salary.util.SalaryEntityUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java index 427f28ada..65e7f0f83 100644 --- a/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillItemNameServiceImpl.java @@ -14,7 +14,7 @@ import com.engine.salary.service.SalaryItemService; import com.engine.salary.service.SalaryTemplateService; import com.engine.salary.util.SalaryEntityUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java index e1f096f63..3e4528309 100644 --- a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java @@ -28,7 +28,7 @@ import com.engine.salary.service.SalarySobRangeService; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.util.SalaryEntityUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java index e15006e2b..9d1a125df 100644 --- a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java @@ -22,7 +22,7 @@ import com.engine.salary.util.JsonUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 20cb9f176..11ce7a692 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -61,7 +61,7 @@ import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java index 54808736d..78d313366 100644 --- a/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java @@ -20,7 +20,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import weaver.hrm.User; diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index fa0a889fc..268912117 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -25,7 +25,7 @@ import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.valid.ValidUtil; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java index e640a2b3f..722149a40 100644 --- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java @@ -36,7 +36,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.RuntimeTypeEnum; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ObjectUtils; diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 591261abb..03df3c980 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -28,7 +28,7 @@ import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.mzlion.core.utils.BeanUtils; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java index 5d6cf042c..72838fc10 100644 --- a/src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java @@ -7,7 +7,7 @@ import com.engine.salary.mapper.taxagent.TaxAgentAdminMapper; import com.engine.salary.service.TaxAgentAdminService; import com.engine.salary.util.db.MapperProxyFactory; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import java.util.Collection; diff --git a/src/com/engine/salary/service/impl/TaxAgentBaseServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentBaseServiceImpl.java index 25cae8472..d31a2a6de 100644 --- a/src/com/engine/salary/service/impl/TaxAgentBaseServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentBaseServiceImpl.java @@ -15,7 +15,7 @@ import com.engine.salary.service.SalaryAcctRecordService; import com.engine.salary.service.TaxAgentBaseService; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import weaver.hrm.User; diff --git a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java index f7fd19a94..c595c9139 100644 --- a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java @@ -17,7 +17,7 @@ import com.engine.salary.service.TaxAgentEmpService; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.google.common.collect.Lists; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import weaver.hrm.User; diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 2c1a38017..caf96a0f9 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -38,7 +38,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.weaver.util.threadPool.ThreadPoolUtil; import com.weaver.util.threadPool.entity.LocalRunnable; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index 74ead2a26..cf3c4b893 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -50,7 +50,7 @@ import com.google.common.collect.Lists; import com.weaver.util.threadPool.ThreadPoolUtil; import com.weaver.util.threadPool.constant.ModulePoolEnum; import com.weaver.util.threadPool.entity.LocalRunnable; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/com/engine/salary/timer/SyncTaxAgentEmp2SobEmpJob.java b/src/com/engine/salary/timer/SyncTaxAgentEmp2SobEmpJob.java index 5df6d7b5e..d1a823059 100644 --- a/src/com/engine/salary/timer/SyncTaxAgentEmp2SobEmpJob.java +++ b/src/com/engine/salary/timer/SyncTaxAgentEmp2SobEmpJob.java @@ -8,7 +8,7 @@ import com.engine.salary.service.SalarySobRangeService; import com.engine.salary.service.SalarySobService; import com.engine.salary.service.impl.SalarySobRangeServiceImpl; import com.engine.salary.service.impl.SalarySobServiceImpl; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import weaver.general.BaseBean; diff --git a/src/com/engine/salary/util/SalaryTokenUtil.java b/src/com/engine/salary/util/SalaryTokenUtil.java index ba2509350..68446cf30 100644 --- a/src/com/engine/salary/util/SalaryTokenUtil.java +++ b/src/com/engine/salary/util/SalaryTokenUtil.java @@ -3,7 +3,7 @@ package com.engine.salary.util; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.engine.salary.exception.SalaryRunTimeException; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.general.BaseBean; diff --git a/src/com/engine/salary/util/db/IdGenerator.java b/src/com/engine/salary/util/db/IdGenerator.java new file mode 100644 index 000000000..3a900a8d6 --- /dev/null +++ b/src/com/engine/salary/util/db/IdGenerator.java @@ -0,0 +1,46 @@ +package com.engine.salary.util.db; + +import java.util.concurrent.atomic.AtomicLong; + +public class IdGenerator { + private static AtomicLong next = new AtomicLong(1L); + public static final int ID_LENGTH_36 = 36; + + public IdGenerator() { + } + + public static long generate() { + return System.currentTimeMillis() + next.getAndIncrement(); + } + + public static String generateId() { + return System.currentTimeMillis() + String.valueOf(next.getAndIncrement()); + } + + public static String generateStrId() { + return System.currentTimeMillis() + generateStrId(36); + } + + public static String generateStrId(int idLength) { + if (idLength >= 1 && idLength <= 36) { + char[] srcChars = new char[]{'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'g', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + char[] chars = new char[idLength]; + + for(int i = 0; i < idLength; ++i) { + if (i != 8 && i != 13 && i != 18 && i != 23) { + if (i == 0) { + chars[i] = srcChars[(int)(Math.random() * 26.0D) % 26]; + } else { + chars[i] = srcChars[(int)(Math.random() * 36.0D) % 36]; + } + } else { + chars[i] = '_'; + } + } + + return new String(chars); + } else { + return ""; + } + } +} diff --git a/src/com/engine/salary/wrapper/SalarySobWrapper.java b/src/com/engine/salary/wrapper/SalarySobWrapper.java index c9f1ddd8e..e8259d52a 100644 --- a/src/com/engine/salary/wrapper/SalarySobWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobWrapper.java @@ -27,7 +27,7 @@ import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.SalarySobUtil; import com.engine.salary.util.page.PageInfo; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import weaver.hrm.User; From e92e134d2136d22b8200cc038b8c1c0705c2e479 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 25 Jan 2024 11:41:35 +0800 Subject: [PATCH 066/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=E6=94=B9=E9=80=A0=EF=BC=8C=E8=A1=A5?= =?UTF-8?q?=E5=8F=91=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/SalaryTemplateServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index c778138ad..cd7b1bc8e 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -28,6 +28,7 @@ import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salarysob.SalarySobEmpFieldMapper; import com.engine.salary.service.*; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -283,6 +284,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate BeanUtils.copyProperties(salaryTemplate, salaryTemplateNew); salaryTemplateNew.setId(null); salaryTemplateNew.setName(copyParam.getName()); + salaryTemplateNew.setReplenishName(copyParam.getName() + "-" + SalaryI18nUtil.getI18nLabel(0, "补发工资单")); salaryTemplateNew.setUseType(SalaryTemplateWhetherEnum.FALSE.getValue()); //20240122逻辑变更，拷贝工资单模板时，可变更薪资账套 From 78f96c5008d4f6ef6e53d1432740aae2a693374a Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 25 Jan 2024 13:37:35 +0800 Subject: [PATCH 067/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E6=8B=89=E5=8F=9620240101=E5=88=86=E6=94=AF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=86=85=E5=AE=B9=EF=BC=8C=E5=B9=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SIAccountServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 0095dcbf2..857196426 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -67,7 +67,6 @@ import com.google.common.collect.Maps; import com.mzlion.core.utils.BeanUtils; import com.engine.salary.util.db.IdGenerator; import com.wbi.util.StringUtil; -import dm.jdbc.util.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.math.NumberUtils; @@ -76,7 +75,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.beans.BeanUtils; import weaver.file.ImageFileManager; import weaver.general.Util; import weaver.hrm.User; From 2aa4ed05d882563da12b796763a335105599380e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 25 Jan 2024 13:56:18 +0800 Subject: [PATCH 068/169] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=BE=BE=E6=A2=A6?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 2639788c3..bbaf325ab 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -756,7 +756,7 @@ public class SIArchivesBiz { * 新增 * * @param param - * @param employeeId + * @param user */ public void insert(InsuranceArchivesSaveParam param, User user) { SalaryAssert.notNull(param.getWelfareType(), "福利类型为空"); From f215b45afaab663c07377a2f5267c1539f22de02 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 26 Jan 2024 10:04:53 +0800 Subject: [PATCH 069/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=E6=94=B9=E9=80=A0=EF=BC=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=B8=A6=E9=80=89=E6=8B=A9=E8=96=AA=E8=B5=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=80=BB=E8=BE=91=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryBillSalaryItemQueryParam.java | 2 ++ .../entity/salarysob/po/SalarySobItemGroupPO.java | 2 +- .../salary/wrapper/SalaryTemplateWrapper.java | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java index 26c819771..fa5540965 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java @@ -16,6 +16,8 @@ public class SalaryBillSalaryItemQueryParam extends BaseQueryParam { private Long groupId; + private String groupName; + private Boolean isReplenish; private List existSalaryItemIds; diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java index 4a6b5502a..64ef8a52f 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemGroupPO.java @@ -34,7 +34,7 @@ public class SalarySobItemGroupPO { private Long salarySobId; /** - * 薪资账套的名称 + * 薪资账套中薪资项目分组的名称 */ private String name; diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 6149b500e..a1d54e5da 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -9,16 +9,19 @@ import com.engine.salary.entity.salaryBill.po.SalaryBillItemNamePO; import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; +import com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.enums.salarybill.SalaryTemplateReplenishRuleEnum; import com.engine.salary.enums.salarybill.SalaryTemplateVarEnum; import com.engine.salary.enums.salarybill.SalaryTemplateWhetherEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.salarysob.SalarySobItemGroupMapper; import com.engine.salary.service.*; import com.engine.salary.service.impl.*; import com.engine.salary.util.JsonUtil; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.mzlion.core.utils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; @@ -71,6 +74,10 @@ public class SalaryTemplateWrapper extends Service { return ServiceUtil.getService(SalaryBillItemNameServiceImpl.class, user); } + private SalarySobItemGroupMapper getSalarySobItemGroupMapper() { + return MapperProxyFactory.getProxy(SalarySobItemGroupMapper.class); + } + /** * 工资单模板列表 * @@ -479,7 +486,13 @@ public class SalaryTemplateWrapper extends Service { Boolean isReplenish = Optional.ofNullable(param.getIsReplenish()).orElse(false); List salaryItemSet = getSalaryTemplateService(user).getSalaryItemSetContainHide(param.getSalarySobId(), param.getSalaryTemplateId(), isReplenish); Long groupId = param.getGroupId(); - return salaryItemSet.stream().filter(s -> Objects.equals(s.getGroupId(), groupId + "")).map(SalaryTemplateSalaryItemSetListDTO::getItems).findFirst().orElse(Collections.emptyList()).stream().filter(item -> !Optional.ofNullable(param.getExistSalaryItemIds()).orElse(Collections.emptyList()).contains(item.getId())).collect(Collectors.toList()); + //工资单模板copy可能导致groupId不匹配 + List salarySobItemGroupPOS = getSalarySobItemGroupMapper().listSome(SalarySobItemGroupPO.builder().salarySobId(param.getSalarySobId()).name(param.getGroupName()).build()); + if (salarySobItemGroupPOS != null && salarySobItemGroupPOS.size() > 0) { + groupId = salarySobItemGroupPOS.get(0).getId(); + } + Long finalGroupId = groupId; + return salaryItemSet.stream().filter(s -> Objects.equals(s.getGroupId(), finalGroupId + "")).map(SalaryTemplateSalaryItemSetListDTO::getItems).findFirst().orElse(Collections.emptyList()).stream().filter(item -> !Optional.ofNullable(param.getExistSalaryItemIds()).orElse(Collections.emptyList()).contains(item.getId())).collect(Collectors.toList()); } /** From 5e9956fbbf5f35a8884f7c018b962c1f3fe5675b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 26 Jan 2024 14:56:58 +0800 Subject: [PATCH 070/169] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1=E6=9D=BF=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=A8=A1=E6=9D=BFid=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=97=B6?= =?UTF-8?q?=E5=8F=96=E5=88=B0=E4=BA=86=E5=85=B6=E4=BB=96=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E5=91=BD=E5=90=8D=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryTemplateServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 03df3c980..444a799d8 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -363,10 +363,14 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate public List getSalaryItemSetContainHide(Long salarySobId, Long salaryTemplateId, boolean isReplenish) { SalarySobItemAggregateDTO salarySobItemAggregate = getSalarySobItemService(user).getAggregateBySalarySobId(salarySobId); // 获取工资单薪资项目展示名信息 - List billItemNameList = getSalaryBillItemNameService(user).ListByTemplateAndType( - SalaryBillItemNamePO.builder().salaryTemplateId(salaryTemplateId) - .salaryBillType(isReplenish ? 1 : 0) - .build()); + List billItemNameList = Collections.emptyList(); + if (salaryTemplateId != null) { + billItemNameList = getSalaryBillItemNameService(user).ListByTemplateAndType( + SalaryBillItemNamePO.builder().salaryTemplateId(salaryTemplateId) + .salaryBillType(isReplenish ? 1 : 0) + .build()); + } + Map itemShowNameMap = SalaryEntityUtil.convert2Map(billItemNameList, SalaryBillItemNamePO::getSalaryItemId, SalaryBillItemNamePO::getSalaryItemShowName); List salaryTemplateSalaryItemSetListDTOS = SalaryTemplateBO.convertSalarySobItemAggregateToSalaryItemSet(salarySobItemAggregate, new Long(user.getUID()), isReplenish); From 6a8c9aebe338d4ea011b9958f25036da04ab933c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 29 Jan 2024 10:05:30 +0800 Subject: [PATCH 071/169] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=95=B0=E6=8D=AE=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/biz/AttendQuoteDataValueBiz.java | 28 ++++++++++++------- .../po/AttendQuoteDataValuePO.java | 4 +-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java index 9096fce51..a9a7c96cc 100644 --- a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java +++ b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java @@ -31,17 +31,25 @@ public class AttendQuoteDataValueBiz { public List listSome(AttendQuoteDataValuePO param) { + List list = new ArrayList<>(); SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AttendQuoteDataValueMapper mapper = sqlSession.getMapper(AttendQuoteDataValueMapper.class); - return mapper.listSome(param); + + List employeeIds = param.getEmployeeIds(); + List> partition = Lists.partition(employeeIds, 100); + partition.forEach(empIds -> { + param.setEmployeeIds(empIds); + list.addAll(mapper.listSome(param)); + }); } finally { sqlSession.close(); } + return list; } public void insertData(List values) { - if(CollectionUtils.isEmpty(values)){ + if (CollectionUtils.isEmpty(values)) { return; } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); @@ -68,14 +76,14 @@ public class AttendQuoteDataValueBiz { public void updateDataValue(AttendQuoteDataValuePO po) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - AttendQuoteDataValueMapper mapper = sqlSession.getMapper(AttendQuoteDataValueMapper.class); - mapper.updateDataValueByFiledIdAndEmployeeId(po); - sqlSession.commit(); - } finally { - sqlSession.close(); - } + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + AttendQuoteDataValueMapper mapper = sqlSession.getMapper(AttendQuoteDataValueMapper.class); + mapper.updateDataValueByFiledIdAndEmployeeId(po); + sqlSession.commit(); + } finally { + sqlSession.close(); + } } } diff --git a/src/com/engine/salary/entity/datacollection/po/AttendQuoteDataValuePO.java b/src/com/engine/salary/entity/datacollection/po/AttendQuoteDataValuePO.java index 9e76422f0..b9c8cd84f 100644 --- a/src/com/engine/salary/entity/datacollection/po/AttendQuoteDataValuePO.java +++ b/src/com/engine/salary/entity/datacollection/po/AttendQuoteDataValuePO.java @@ -5,8 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Collection; import java.util.Date; +import java.util.List; /** * 考勤引用数据值表 @@ -63,6 +63,6 @@ public class AttendQuoteDataValuePO { private String tenantKey; //查询参数 - private Collection employeeIds; + private List employeeIds; } \ No newline at end of file From c4adecf436dc5cd1b2dbc93f2d3879b55e51a8d9 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 29 Jan 2024 11:30:04 +0800 Subject: [PATCH 072/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=87=8F=E5=91=98?= =?UTF-8?q?action=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/StayDelToStopSIArchiveAction.java | 19 +++++++++- .../salary/service/SIArchivesService.java | 5 +++ .../service/impl/SIArchivesServiceImpl.java | 38 +++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/action/StayDelToStopSIArchiveAction.java b/src/com/engine/salary/action/StayDelToStopSIArchiveAction.java index c7aa0a8bf..1c75d42c0 100644 --- a/src/com/engine/salary/action/StayDelToStopSIArchiveAction.java +++ b/src/com/engine/salary/action/StayDelToStopSIArchiveAction.java @@ -1,14 +1,18 @@ package com.engine.salary.action; +import cn.hutool.core.util.StrUtil; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; +import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.SIArchivesService; import com.engine.salary.service.impl.SIArchivesServiceImpl; +import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -84,6 +88,12 @@ public class StayDelToStopSIArchiveAction implements Action { Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() ); Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString()); + String payEndYearMonth = importDataMap.getOrDefault("最后缴纳月", "").toString(); + if (StrUtil.isNotBlank(payEndYearMonth) && !SalaryDateUtil.checkYearMonth(payEndYearMonth)) { + requestInfo.getRequestManager().setMessage("最后缴纳月格式有误，正确格式示例为'2021-01'"); + return FAILURE_AND_CONTINUE; + } + //操作人 String uid = importDataMap.getOrDefault("操作人","1").toString(); User user = new User(Integer.parseInt(uid)); @@ -92,12 +102,17 @@ public class StayDelToStopSIArchiveAction implements Action { if(insuranceArchivesBaseInfoPO == null){ requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在福利档案，请检查后重试！"); return FAILURE_AND_CONTINUE; - } else if(!insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())){ + } else if(StrUtil.isBlank(payEndYearMonth) && !insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())){ requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工的福利档案状态不是待减员，无法进行减员操作，请检查后重试！"); return FAILURE_AND_CONTINUE; } //减员 - Map resultMap = getSIArchivesService(user).stayDelToStop(Collections.singletonList(insuranceArchivesBaseInfoPO.getId())); + Map resultMap = new HashMap<>(); + if (StrUtil.isBlank(payEndYearMonth)) { + resultMap = getSIArchivesService(user).stayDelToStop(Collections.singletonList(insuranceArchivesBaseInfoPO.getId())); + } else { + resultMap = getSIArchivesService(user).stopWithoutLimit(Collections.singletonList(insuranceArchivesBaseInfoPO.getId()), payEndYearMonth); + } if (resultMap.get("type").toString().equals("fail")) { requestInfo.getRequestManager().setMessage(resultMap.get("msg").toString()); return FAILURE_AND_CONTINUE; diff --git a/src/com/engine/salary/service/SIArchivesService.java b/src/com/engine/salary/service/SIArchivesService.java index 3e98c15d3..0bdc90cd9 100644 --- a/src/com/engine/salary/service/SIArchivesService.java +++ b/src/com/engine/salary/service/SIArchivesService.java @@ -74,6 +74,11 @@ public interface SIArchivesService { */ Map stayDelToStop(Collection ids); + /** + * 批量减员，直接减员，并给予最后缴纳月 + */ + Map stopWithoutLimit(Collection ids, String yearMonth); + /** * 全量减员 */ diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 8738c66f9..6e1f5e94a 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -876,6 +876,44 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return resultMap; } + @Override + public Map stopWithoutLimit(Collection ids, String yearMonth) { + + if (CollectionUtils.isEmpty(ids)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + } + List baseInfoPOList = getInsuranceBaseInfoMapper().listByIds(ids); + + //分别新建福利档案基础信息相关的社保、公积金、其他福利档案列表 + List socialList = new ArrayList<>(); + List fundList = new ArrayList<>(); + List otherList = new ArrayList<>(); + //获取待处理的福利档案基础信息id列表 + List baseInfoIds = baseInfoPOList.stream().map(InsuranceArchivesBaseInfoPO::getId).collect(Collectors.toList()); + //分别获取福利档案基础信息相关的社保、公积金、其他福利档案id列表 + List socialIds = baseInfoPOList.stream().map(InsuranceArchivesBaseInfoPO::getSocialArchivesId).collect(Collectors.toList()); + List fundIds = baseInfoPOList.stream().map(InsuranceArchivesBaseInfoPO::getFundArchivesId).collect(Collectors.toList()); + List otherIds = baseInfoPOList.stream().map(InsuranceArchivesBaseInfoPO::getOtherArchivesId).collect(Collectors.toList()); + //进行减员操作 + if (baseInfoIds.size() > 0) { + getInsuranceBaseInfoMapper().updateRunStatusByIds(InsuranceArchivesBaseInfoPO.builder() + .ids(baseInfoIds).runStatus(EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue()).build()); + + getSocialSchemeMapper().batchUpdateEndTime(socialIds, yearMonth); + getFundSchemeMapper().batchUpdateEndTime(fundIds, yearMonth); + getOtherSchemeMapper().batchUpdateEndTime(otherIds, yearMonth); + } + + + Map resultMap = new HashMap<>(2); + String resultMsg = "操作成功"; + String resultType = "success"; + + resultMap.put("type", resultType); + resultMap.put("msg", resultMsg); + return resultMap; + } + /** * 全量减员 */ From a78a10cad6209cd656346cdf0c8211e6fc40be9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 29 Jan 2024 15:12:12 +0800 Subject: [PATCH 073/169] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/elog/config/ELogTableChecker.java | 2 +- src/com/engine/salary/elog/service/impl/LocalElogService.java | 2 +- src/com/engine/salary/elog/util/LoggerTemplate.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/elog/config/ELogTableChecker.java b/src/com/engine/salary/elog/config/ELogTableChecker.java index 272da15a7..741dea65c 100644 --- a/src/com/engine/salary/elog/config/ELogTableChecker.java +++ b/src/com/engine/salary/elog/config/ELogTableChecker.java @@ -2,8 +2,8 @@ package com.engine.salary.elog.config; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.mapper.elog.ElogTableCheckerMapper; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; -import dm.jdbc.util.IdGenerator; public class ELogTableChecker { diff --git a/src/com/engine/salary/elog/service/impl/LocalElogService.java b/src/com/engine/salary/elog/service/impl/LocalElogService.java index 3900f4727..404bea1db 100644 --- a/src/com/engine/salary/elog/service/impl/LocalElogService.java +++ b/src/com/engine/salary/elog/service/impl/LocalElogService.java @@ -8,8 +8,8 @@ import com.engine.salary.elog.enums.ElogConsts; import com.engine.salary.elog.service.ILocalElogService; import com.engine.salary.elog.util.ElogUtils; import com.engine.salary.mapper.elog.LocalElogAopDaoMapper; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; -import dm.jdbc.util.IdGenerator; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java index a82021433..842f72783 100644 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ b/src/com/engine/salary/elog/util/LoggerTemplate.java @@ -10,7 +10,7 @@ import com.engine.salary.elog.async.LoggerMessageListener; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.elog.entity.dto.LoggerDetailContext; import com.engine.salary.elog.entity.dto.TableChangeBean; -import dm.jdbc.util.IdGenerator; +import com.engine.salary.util.db.IdGenerator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.ArrayUtils; From 3a0646df9cdf336ccda192d986d294fd3772bd38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 29 Jan 2024 16:21:17 +0800 Subject: [PATCH 074/169] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/elog/entity/dto/ElogBean.java | 10 +++++----- .../salary/elog/service/impl/LoggerTableService.java | 2 +- src/com/engine/salary/elog/util/ElogServiceUtils.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/engine/salary/elog/entity/dto/ElogBean.java b/src/com/engine/salary/elog/entity/dto/ElogBean.java index b79b0f66e..84a24cfd9 100644 --- a/src/com/engine/salary/elog/entity/dto/ElogBean.java +++ b/src/com/engine/salary/elog/entity/dto/ElogBean.java @@ -16,7 +16,7 @@ public class ElogBean implements Serializable { private static final long serialVersionUID = 5357552376749564256L; private String module; private String function; - private String pageNum; + private String current; private String pageSize; private String dataset; private String searchMap; @@ -42,12 +42,12 @@ public class ElogBean implements Serializable { this.function = function; } - public String getPageNum() { - return pageNum; + public String getCurrent() { + return current; } - public void setPageNum(String pageNum) { - this.pageNum = pageNum; + public void setCurrent(String current) { + this.current = current; } public String getPageSize() { diff --git a/src/com/engine/salary/elog/service/impl/LoggerTableService.java b/src/com/engine/salary/elog/service/impl/LoggerTableService.java index 217872e0c..a40f63488 100644 --- a/src/com/engine/salary/elog/service/impl/LoggerTableService.java +++ b/src/com/engine/salary/elog/service/impl/LoggerTableService.java @@ -91,7 +91,7 @@ public class LoggerTableService extends Service implements ILoggerTableService { String function = elogBean.getFunction(); String searchMap = elogBean.getSearchMap(); String pageSize = elogBean.getPageSize(); - String pageNum = elogBean.getPageNum(); + String pageNum = elogBean.getCurrent(); String downloadSize = elogBean.getDownloadSize(); List filterConditionDtos = elogBean.getFilterConditionDtos(); String transMethod = elogBean.getTransMethod(); diff --git a/src/com/engine/salary/elog/util/ElogServiceUtils.java b/src/com/engine/salary/elog/util/ElogServiceUtils.java index e06225b36..fb2ecafc6 100644 --- a/src/com/engine/salary/elog/util/ElogServiceUtils.java +++ b/src/com/engine/salary/elog/util/ElogServiceUtils.java @@ -40,7 +40,7 @@ public class ElogServiceUtils { ElogBean elogBean = new ElogBean(); String module = datas.getString("module"); String function = datas.getString("function"); - String pageNum = datas.getString("pageNum"); + String pageNum = datas.getString("current"); String pageSize = datas.getString("pageSize"); String searchMap = datas.getString("searchMap"); String transMethod = datas.getString("transMethod"); @@ -53,7 +53,7 @@ public class ElogServiceUtils { Map authParamsJson = JSONObject.parseObject(authParams); elogBean.setModule(module); elogBean.setFunction(function); - elogBean.setPageNum(pageNum); + elogBean.setCurrent(pageNum); elogBean.setPageSize(pageSize); elogBean.setSearchMap(searchMap); elogBean.setTransMethod(transMethod); From a8bfe83030cbdf174974c3fc6a6aa409455a3dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 30 Jan 2024 09:58:13 +0800 Subject: [PATCH 075/169] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/biz/AddUpDeductionBiz.java | 64 +------ .../engine/salary/biz/AddUpSituationBiz.java | 16 -- .../engine/salary/biz/OtherDeductionBiz.java | 16 -- .../salary/config/SalaryElogConfig.java | 170 +++++------------- .../impl/AddUpDeductionServiceImpl.java | 61 ++++++- .../impl/AddUpSituationServiceImpl.java | 120 +++++++++---- .../impl/OtherDeductionServiceImpl.java | 67 ++++++- .../impl/SalaryAcctEmployeeServiceImpl.java | 6 +- .../impl/SalaryAcctExcelServiceImpl.java | 6 +- .../impl/SalaryAcctRecordServiceImpl.java | 10 +- .../impl/SalaryAcctResultServiceImpl.java | 5 +- .../service/impl/SalaryItemServiceImpl.java | 10 +- .../impl/SalarySobAdjustRuleServiceImpl.java | 25 ++- .../impl/SalarySobCheckRuleServiceImpl.java | 64 +++---- .../impl/SalarySobExtRangeServiceImpl.java | 2 - .../impl/SalarySobItemServiceImpl.java | 25 +-- .../impl/SalarySobRangeServiceImpl.java | 30 ++-- .../impl/SysSalaryItemServiceImpl.java | 29 +-- .../engine/salary/util/SalaryLoggerUtil.java | 139 +++++++------- 19 files changed, 433 insertions(+), 432 deletions(-) diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java index 8b9ffa0a4..ef512160b 100644 --- a/src/com/engine/salary/biz/AddUpDeductionBiz.java +++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java @@ -12,8 +12,8 @@ import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; import weaver.general.BaseBean; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; public class AddUpDeductionBiz extends BaseBean { @@ -145,67 +145,7 @@ public class AddUpDeductionBiz extends BaseBean { } - /** - * 处理导入数据 - * - * @param pos - */ - public void handleImportData(List pos) { - if (CollectionUtils.isEmpty(pos)) { - return; - } - AddUpDeduction po = pos.get(0); - // 多条相同人的则以第一条为准，如果逆序排列（用于重复的则以最后一条为准）Collections.reverse(pos); - // 去重（通过记录的唯一条件(申报月份，人员id，个税扣缴义务人id)拼接） - List finalPos = pos.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getEmployeeId() + "-" + f.getTaxAgentId()))), ArrayList::new)); - // 查询已有数据 - List list = listSome(AddUpDeduction.builder().declareMonth(po.getDeclareMonth()).build()); - // 待修改的 本地已存在则更新【交集】 - List updateList = list.stream().map(m -> { - Optional optional = finalPos.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); - AddUpDeduction temp = null; - if (optional.isPresent()) { - temp = optional.get(); - // 换成本地库的id - temp.setId(m.getId()); - } - return temp; - }).filter(Objects::nonNull).collect(Collectors.toList()); - // 待新增的 导入比本地多，则新增【差集(导入 - local)】 - List saveList = finalPos.stream().map(m -> { - Optional optional = list.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); - AddUpDeduction temp = null; - if (!optional.isPresent()) { - temp = m; - } - return temp; - }).filter(Objects::nonNull).collect(Collectors.toList()); - // 修改 - if (CollectionUtils.isNotEmpty(updateList)) { - batchUpdate(updateList); - } - // 保存 - if (CollectionUtils.isNotEmpty(saveList)) { - batchSave(saveList); - } - // 记录操作日志 -// saveList.addAll(updateList); -// -// if (CollectionUtils.isNotEmpty(saveList)) { -// LoggerContext loggerContext = new LoggerContext(); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setNewValueList(saveList); -// loggerContext.setTenant_key(message.getTenantKey()); -// loggerContext.setOperator(message.getUserId().toString()); -// loggerContext.setOperatorName(message.getOpreator()); -// loggerContext.setClientIp(message.getClientIp()); -// addUpDeductionLoggerTemplate.write(loggerContext); -// } - } public void batchDeleteByIDS(List ids) { diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java index e1fbdb901..b3d47b935 100644 --- a/src/com/engine/salary/biz/AddUpSituationBiz.java +++ b/src/com/engine/salary/biz/AddUpSituationBiz.java @@ -185,22 +185,6 @@ public class AddUpSituationBiz extends BaseBean { if (CollectionUtils.isNotEmpty(saveList)) { batchSave(saveList); } - // 记录操作日志 -// saveList.addAll(updateList); -// -// if (CollectionUtils.isNotEmpty(saveList)) { -// LoggerContext loggerContext = new LoggerContext(); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setNewValueList(saveList); -// loggerContext.setTenant_key(message.getTenantKey()); -// loggerContext.setOperator(message.getUserId().toString()); -// loggerContext.setOperatorName(message.getOpreator()); -// loggerContext.setClientIp(message.getClientIp()); -// AddUpSituationLoggerTemplate.write(loggerContext); -// } } diff --git a/src/com/engine/salary/biz/OtherDeductionBiz.java b/src/com/engine/salary/biz/OtherDeductionBiz.java index 1b107764c..5a843f8ee 100644 --- a/src/com/engine/salary/biz/OtherDeductionBiz.java +++ b/src/com/engine/salary/biz/OtherDeductionBiz.java @@ -169,22 +169,6 @@ public class OtherDeductionBiz extends BaseBean { if (CollectionUtils.isNotEmpty(saveList)) { batchSave(saveList); } - // 记录操作日志 -// saveList.addAll(updateList); -// -// if (CollectionUtils.isNotEmpty(saveList)) { -// LoggerContext loggerContext = new LoggerContext(); -// loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(message.getTenantKey(), message.getUserId(), 100351, "导入累计专项附加扣除")); -// loggerContext.setNewValueList(saveList); -// loggerContext.setTenant_key(message.getTenantKey()); -// loggerContext.setOperator(message.getUserId().toString()); -// loggerContext.setOperatorName(message.getOpreator()); -// loggerContext.setClientIp(message.getClientIp()); -// addUpDeductionLoggerTemplate.write(loggerContext); -// } } diff --git a/src/com/engine/salary/config/SalaryElogConfig.java b/src/com/engine/salary/config/SalaryElogConfig.java index 7156eeff4..9f72846ea 100644 --- a/src/com/engine/salary/config/SalaryElogConfig.java +++ b/src/com/engine/salary/config/SalaryElogConfig.java @@ -18,289 +18,219 @@ public class SalaryElogConfig { * * @return */ - public static LoggerTemplate taxRateLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "taxrate"); - } + public final static LoggerTemplate taxRateLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "taxrate"); /** * 薪资项目 * * @return */ - public static LoggerTemplate salaryItemLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salaryitem"); - } + public static LoggerTemplate salaryItemLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salaryitem"); /** * 个税扣缴义务人 * * @return */ - public static LoggerTemplate taxAgentLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "taxagent"); - } + public static LoggerTemplate taxAgentLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "taxagent"); - public static LoggerTemplate siCategoryLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "siCategory"); - } + public static LoggerTemplate siCategoryLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "siCategory"); - public static LoggerTemplate siSchemeLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "siScheme"); - } + public static LoggerTemplate siSchemeLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "siScheme"); - public static LoggerTemplate totalSchemeLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "totalScheme"); - } + public static LoggerTemplate totalSchemeLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "totalScheme"); /** * 累计情况 * * @return */ - public static LoggerTemplate addUpSituationLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "addupsituation"); - } + public static LoggerTemplate addUpSituationLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "addupsituation"); /** * 累计专项附加扣除 * * @return */ - public static LoggerTemplate addUpDeductionLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "addupdeduction"); - } + public static LoggerTemplate addUpDeductionLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "addupdeduction"); /** * 其他免税扣除 * * @return */ - public static LoggerTemplate otherDeductionLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "otherdeduction"); - } + public static LoggerTemplate otherDeductionLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "otherdeduction"); /** * 减税 * * @return */ - public static LoggerTemplate derateDeductionLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "deratededuction"); - } + public static LoggerTemplate derateDeductionLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "deratededuction"); /** * 税延养老保险 * * @return */ - public static LoggerTemplate endowmentInsuranceLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "endowmentinsurance"); - } + public static LoggerTemplate endowmentInsuranceLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "endowmentinsurance"); /** * 税延养老保险 * * @return */ - public static LoggerTemplate freeIncomeLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "freeincome"); - } + public static LoggerTemplate freeIncomeLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "freeincome"); /** * 捐赠免税 * * @return */ - public static LoggerTemplate grantDonationLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "grantdonation"); - } + public static LoggerTemplate grantDonationLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "grantdonation"); /** * 捐赠免税 * * @return */ - public static LoggerTemplate healthInsuranceLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "healthinsurance"); - } + public static LoggerTemplate healthInsuranceLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "healthinsurance"); /** * 其他免税扣除 * * @return */ - public static LoggerTemplate otherDerateDeductionLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "otherderatededuction"); - } + public static LoggerTemplate otherDerateDeductionLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "otherderatededuction"); /** * 考勤引用 * * @return */ - public static LoggerTemplate attendQuoteLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "attendquote"); - } + public static LoggerTemplate attendQuoteLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "attendquote"); /** * 考勤引用字段管理 * * @return */ - public static LoggerTemplate attendQuoteFieldLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "attendfield"); - } + public static LoggerTemplate attendQuoteFieldLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "attendfield"); /** * 考勤引用字段设置 * * @return */ - public static LoggerTemplate attendQuoteFieldSettingLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "attendfieldset"); - } + public static LoggerTemplate attendQuoteFieldSettingLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "attendfieldset"); /** * 薪资账套 * * @return */ - public static LoggerTemplate salarySobLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salarysob"); - } + public static LoggerTemplate salarySobLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salarysob"); /** * 薪资核算 * * @return */ - public static LoggerTemplate salaryAcctRecordLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "acctrecord"); - } - + public static LoggerTemplate salaryAcctRecordLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "acctrecord"); /** * 个税申报表 * * @return */ - public static LoggerTemplate taxDeclarationLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "taxdecla"); - } + public static LoggerTemplate taxDeclarationLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "taxdecla"); /** * 福利档案 * * @return */ - public static LoggerTemplate siArchivesLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "siarchives"); - } + public static LoggerTemplate siArchivesLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "siarchives"); /** * 社保规则 */ - public static LoggerTemplate archiveRuleLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "archiverule"); - } + public static LoggerTemplate archiveRuleLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "archiverule"); /** * 代缴机构 * * @return */ - public static LoggerTemplate paymentAgencyLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "paymentagency"); - } + public static LoggerTemplate paymentAgencyLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "paymentagency"); /** * 福利核算 * * @return */ - public static LoggerTemplate siAccountLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "siaccount"); - } + public static LoggerTemplate siAccountLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "siaccount"); /** * 工资单模板 * * @return */ - public static LoggerTemplate salaryTemplateLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salarytemplate"); - } + public static LoggerTemplate salaryTemplateLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salarytemplate"); /** * 工资单发放 * * @return */ - public static LoggerTemplate salarySendLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salarysend"); - } + public static LoggerTemplate salarySendLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salarysend"); /** * 外部人员 * * @return */ - public static LoggerTemplate extEmployeeLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "extemployee"); - } + public static LoggerTemplate extEmployeeLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "extemployee"); /** * 薪资档案 * * @return */ - public static LoggerTemplate salaryArchiveLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salaryarchive"); - } + public static LoggerTemplate salaryArchiveLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salaryarchive"); /** * 薪资档案-字段 * * @return */ - public static LoggerTemplate salaryArchiveFieldLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salarcfield"); - } - + public static LoggerTemplate salaryArchiveFieldLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salarcfield"); /** * 薪资档案-薪资项目调整 * * @return */ - public static LoggerTemplate salaryArchiveItemAdjustLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salarcitemadj"); - } + public static LoggerTemplate salaryArchiveItemAdjustLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salarcitemadj"); /** * 薪资档案-批量调薪 * * @return */ - public static LoggerTemplate salaryArchiveBatchAdjustLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "salarcbatadj"); - } + public static LoggerTemplate salaryArchiveBatchAdjustLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "salarcbatadj"); /** * 自定义业务数据设置 * * @return */ - public static LoggerTemplate customDataSetLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "customdataset"); - } + public static LoggerTemplate customDataSetLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "customdataset"); /** * 自定义业务数据 * * @return */ - public static LoggerTemplate customDataLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "customdata"); - } + public static LoggerTemplate customDataLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "customdata"); /** @@ -308,63 +238,49 @@ public class SalaryElogConfig { * * @return */ - public static LoggerTemplate employeeDeclareLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "empdeclare"); - } + public static LoggerTemplate employeeDeclareLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "empdeclare"); /** * 单位扣款账号 * * @return */ - public static LoggerTemplate withholdAccountLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "whaccount"); - } + public static LoggerTemplate withholdAccountLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "whaccount"); /** * 银行报盘 * * @return */ - public static LoggerTemplate bankOfferLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "bankoffer"); - } + public static LoggerTemplate bankOfferLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "bankoffer"); /** * 银行报盘模板 * * @return */ - public static LoggerTemplate bankOfferTemplateLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "botemplate"); - } + public static LoggerTemplate bankOfferTemplateLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "botemplate"); /** * 薪酬体系标准（岗薪制） * * @return */ - public static LoggerTemplate postSalaryLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "postsalary"); - } + public static LoggerTemplate postSalaryLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "postsalary"); /** * 银行报盘模板 * * @return */ - public static LoggerTemplate taxFreeDetailLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "taxfreedetail"); - } + public static LoggerTemplate taxFreeDetailLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "taxfreedetail"); /** * 最优年终奖计税方案 * * @return */ - public static LoggerTemplate annualBonusPlanLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "annualplan"); - } + public static LoggerTemplate annualBonusPlanLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "annualplan"); /** * 最优年终奖计税方案-累计情况 @@ -372,7 +288,5 @@ public class SalaryElogConfig { * * @return */ - public static LoggerTemplate annualBonusLoggerTemplate() { - return LoggerTemplateBuilder.build("hrsa", "annualbonus"); - } + public static LoggerTemplate annualBonusLoggerTemplate = LoggerTemplateBuilder.build("hrsa", "annualbonus"); } diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index bb0242cf4..ee208bf2d 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -11,6 +11,8 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.AddUpDeductionBiz; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.DataCollectionEmployee; @@ -27,6 +29,7 @@ import com.engine.salary.entity.taxagent.bo.TaxAgentBO; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -385,7 +388,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction } } //入库 - addUpDeductionBiz.handleImportData(eligibleData); + handleImportData(eligibleData); apidatas.put("successCount", successCount); apidatas.put("errorCount", errorCount); apidatas.put("errorData", errorData); @@ -396,6 +399,60 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction return apidatas; } + public void handleImportData(List pos) { + if (CollectionUtils.isEmpty(pos)) { + return; + } + AddUpDeductionBiz addUpDeductionBiz = new AddUpDeductionBiz(); + AddUpDeduction po = pos.get(0); + // 多条相同人的则以第一条为准，如果逆序排列（用于重复的则以最后一条为准）Collections.reverse(pos); + // 去重（通过记录的唯一条件(申报月份，人员id，个税扣缴义务人id)拼接） + List finalPos = pos.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getEmployeeId() + "-" + f.getTaxAgentId()))), ArrayList::new)); + // 查询已有数据 + List list = addUpDeductionBiz.listSome(AddUpDeduction.builder().declareMonth(po.getDeclareMonth()).build()); + // 待修改的 本地已存在则更新【交集】 + List updateList = list.stream().map(m -> { + Optional optional = finalPos.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); + AddUpDeduction temp = null; + if (optional.isPresent()) { + temp = optional.get(); + // 换成本地库的id + temp.setId(m.getId()); + } + return temp; + }).filter(Objects::nonNull).collect(Collectors.toList()); + // 待新增的 导入比本地多，则新增【差集(导入 - local)】 + List saveList = finalPos.stream().map(m -> { + Optional optional = list.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); + AddUpDeduction temp = null; + if (!optional.isPresent()) { + temp = m; + } + return temp; + }).filter(Objects::nonNull).collect(Collectors.toList()); + + // 修改 + if (CollectionUtils.isNotEmpty(updateList)) { + addUpDeductionBiz.batchUpdate(updateList); + } + // 保存 + if (CollectionUtils.isNotEmpty(saveList)) { + addUpDeductionBiz.batchSave(saveList); + } + // 记录操作日志 + saveList.addAll(updateList); + + if (CollectionUtils.isNotEmpty(saveList)) { + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setNewValueList(saveList); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + } + } @Override public void editAddUpDeduction(AddUpDeductionRecordParam addUpDeduction) { @@ -529,7 +586,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction addUpDeduction.setAddUpInfantCare(Util.null2String(addUpDeductionRecordParam.getAddUpInfantCare())); insertData.add(addUpDeduction); //入库 - addUpDeductionBiz.handleImportData(insertData); + handleImportData(insertData); } @Override diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index e4965928c..ecc029dbb 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -8,6 +8,8 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.AddUpSituationBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; @@ -20,6 +22,7 @@ import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam; import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.datacollection.AddUpSituationMapper; @@ -274,7 +277,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation // excel标题 final List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用", "累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", - "累计大病医疗", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护","累计个人养老金"); + "累计大病医疗", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护", "累计个人养老金"); //排序配置 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); @@ -340,7 +343,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation //excel标题 List title = Arrays.asList("姓名", "税款所属期", "个税扣缴义务人", "部门", "手机号", "工号", "累计收入额", "累计减除费用", "累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计企业（职业）年金及其他福利", - "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护","累计个人养老金"); + "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护", "累计个人养老金"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); //查询详细信息 @@ -609,7 +612,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation // 获取已经核算的数据(获取税款所属期下一个月的数据) YearMonth nextTaxYearMonth = SalaryDateUtil.String2YearMonth(taxYearMonthStr); String nextTaxYearMonthStr = taxYearMonthStr; - if( !Objects.equals(nextTaxYearMonth.getMonthValue(),12) ){ + if (!Objects.equals(nextTaxYearMonth.getMonthValue(), 12)) { nextTaxYearMonth = nextTaxYearMonth.plusMonths(1); nextTaxYearMonthStr = nextTaxYearMonth.format(SalaryDateUtil.MONTH_FORMATTER); } @@ -693,7 +696,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工"); errorData.add(errorMessageMap); errorSum += 1; - }else { + } else { Long employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null; po.setEmployeeId(employeeId); } @@ -744,7 +747,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation // } // 判断是否有核算过 - if (CollectionUtils.isNotEmpty(salaryAcctEmployees) && !Objects.equals(taxYearMonthStr.split("-")[1], "12") ) { + if (CollectionUtils.isNotEmpty(salaryAcctEmployees) && !Objects.equals(taxYearMonthStr.split("-")[1], "12")) { Optional optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(po.getEmployeeId()) && f.getTaxAgentId().equals(po.getTaxAgentId())).findFirst(); boolean isExist = list.stream().anyMatch(f -> f.getEmployeeId().equals(po.getEmployeeId()) && f.getTaxAgentId().equals(po.getTaxAgentId())); if (optionalAcctEmp.isPresent() && isExist) { @@ -815,7 +818,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } //入库 - biz.handleImportData(eligibleData); + handleImportData(eligibleData); apidatas.put("successCount", successCount); apidatas.put("errorCount", errorCount); @@ -827,6 +830,61 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation return apidatas; } + public void handleImportData(List pos) { + if (CollectionUtils.isEmpty(pos)) { + return; + } + AddUpSituationBiz biz = new AddUpSituationBiz(); + AddUpSituation po = pos.get(0); + // 多条相同人的则以第一条为准，如果逆序排列（用于重复的则以最后一条为准）Collections.reverse(pos); + // 去重（通过记录的唯一条件(申报月份，人员id，个税扣缴义务人id)拼接） + List finalPos = pos.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getEmployeeId() + "-" + f.getTaxAgentId()))), ArrayList::new)); + // 查询已有数据 + List list = biz.listSome(AddUpSituation.builder().taxYearMonth(po.getTaxYearMonth()).build()); + // 待修改的 本地已存在则更新【交集】 + List updateList = list.stream().map(m -> { + Optional optional = finalPos.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); + AddUpSituation temp = null; + if (optional.isPresent()) { + temp = optional.get(); + // 换成本地库的id + temp.setId(m.getId()); + } + return temp; + }).filter(Objects::nonNull).collect(Collectors.toList()); + // 待新增的 导入比本地多，则新增【差集(导入 - local)】 + List saveList = finalPos.stream().map(m -> { + Optional optional = list.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); + AddUpSituation temp = null; + if (!optional.isPresent()) { + temp = m; + } + return temp; + }).filter(Objects::nonNull).collect(Collectors.toList()); + + // 修改 + if (CollectionUtils.isNotEmpty(updateList)) { + biz.batchUpdate(updateList); + } + // 保存 + if (CollectionUtils.isNotEmpty(saveList)) { + batchSave(saveList); + } +// 记录操作日志 + saveList.addAll(updateList); + + if (CollectionUtils.isNotEmpty(saveList)) { + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setNewValueList(saveList); + SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); + } + } + private void checkImportParam(AddUpSituationImportParam importParam) { @@ -846,8 +904,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } /** - * @description 编辑数据 * @return void + * @description 编辑数据 * @author Harryxzy * @date 2022/10/27 21:32 */ @@ -860,12 +918,12 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation // 获取所有个税扣缴义务人 Collection taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); AddUpSituation byId = biz.getById(addUpSituationParam.getId()); - if(byId == null){ + if (byId == null) { throw new SalaryRunTimeException("该数据不存在！"); } Long taxAgentId = byId.getTaxAgentId(); - boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId() , taxAgentId)); - if(!canEdit){ + boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId(), taxAgentId)); + if (!canEdit) { //没有编辑权限 throw new SalaryRunTimeException("该个税扣缴义务人无权限编辑此数据！"); } @@ -873,14 +931,14 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation // 获取已经核算的数据(获取税款所属期下一个月的数据) YearMonth nextTaxYearMonth = SalaryDateUtil.String2YearMonth(taxYearMonthStr); String nextTaxYearMonthStr = taxYearMonthStr; - if( !Objects.equals(nextTaxYearMonth.getMonthValue(),12) ){ + if (!Objects.equals(nextTaxYearMonth.getMonthValue(), 12)) { nextTaxYearMonth = nextTaxYearMonth.plusMonths(1); nextTaxYearMonthStr = nextTaxYearMonth.format(SalaryDateUtil.MONTH_FORMATTER); } List salaryAcctEmployees = getAddUpDeductionService(user).getAccountedEmployeeDataByTaxYearMonth(nextTaxYearMonthStr); // 判断是否有核算过 - if (CollectionUtils.isNotEmpty(salaryAcctEmployees) && !Objects.equals(taxYearMonthStr.split("-")[1], "12")) { + if (CollectionUtils.isNotEmpty(salaryAcctEmployees) && !Objects.equals(taxYearMonthStr.split("-")[1], "12")) { Optional optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(addUpSituationParam.getEmployeeId()) && f.getTaxAgentId().equals(addUpSituationParam.getTaxAgentId())).findFirst(); if (optionalAcctEmp.isPresent()) { throw new SalaryRunTimeException("该年月这条数据已经核算过,不可进行编辑！"); @@ -903,8 +961,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } /** - * @description 新建数据 * @return void + * @description 新建数据 * @author Harryxzy * @date 2022/10/27 22:04 */ @@ -947,8 +1005,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation //筛选导入人员信息可以在人力资源池中匹配到的人员信息 - boolean employeeSameId = employees.stream().anyMatch(e -> Objects.equals(e.getEmployeeId() , addUpSituationParam.getEmployeeId())); - if(!employeeSameId){ + boolean employeeSameId = employees.stream().anyMatch(e -> Objects.equals(e.getEmployeeId(), addUpSituationParam.getEmployeeId())); + if (!employeeSameId) { throw new SalaryRunTimeException("员工信息不存在"); } po.setEmployeeId(addUpSituationParam.getEmployeeId()); @@ -967,7 +1025,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } } - // fixme 分权判断，若员工离职后，不在扣缴义务人范围内，会有异常 + // fixme 分权判断，若员工离职后，不在扣缴义务人范围内，会有异常 // if (openDevolution) { // Optional optionalTaxAgentEmp = taxAgentEmployees.stream().filter(f -> f.getEmployeeId().equals(po.getEmployeeId())).findFirst(); // if (!optionalTaxAgentEmp.isPresent()) { @@ -1036,7 +1094,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation insertList.add(po); //入库 - biz.handleImportData(insertList); + handleImportData(insertList); } @Override @@ -1055,15 +1113,15 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation List salaryAcctEmployees = getAddUpDeductionService(user).getAccountedEmployeeData(format); // 判断是否有核算过 List deleteList = new ArrayList<>(); - for(int i=0; i first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId() , byId.getTaxAgentId())).findFirst(); - if(!first.isPresent()){ + Optional first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId(), byId.getTaxAgentId())).findFirst(); + if (!first.isPresent()) { throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); } // 判断用户是否存在 @@ -1089,23 +1147,23 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation AddUpSituationBiz biz = new AddUpSituationBiz(); Date declareMonthDate = new Date(); try { - declareMonthDate = (sdf.parse(declareMonthStr+"-01")); - }catch (Exception e){ + declareMonthDate = (sdf.parse(declareMonthStr + "-01")); + } catch (Exception e) { throw new SalaryRunTimeException("日期异常"); } AddUpSituation queryParam = null; - if(deleteParam.getTaxAgentId() != null && !deleteParam.getTaxAgentId().isEmpty()){ + if (deleteParam.getTaxAgentId() != null && !deleteParam.getTaxAgentId().isEmpty()) { // 设置了个税扣缴义务人 Long taxAgentId = SalaryEntityUtil.string2Long(deleteParam.getTaxAgentId()); - boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t , taxAgentId)); - if(!canDelete){ + boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t, taxAgentId)); + if (!canDelete) { throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内!"); } ArrayList tai = new ArrayList<>(); tai.add(taxAgentId); - queryParam = AddUpSituation.builder().taxYearMonth(declareMonthDate).taxAgentIds(tai).build(); - }else { + queryParam = AddUpSituation.builder().taxYearMonth(declareMonthDate).taxAgentIds(tai).build(); + } else { queryParam = AddUpSituation.builder().taxYearMonth(declareMonthDate).taxAgentIds(taxAgentIds).build(); } @@ -1115,7 +1173,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation String format = salaryMonthDate.plusMonths(1).atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM")); // 获取已经核算的数据 List employees = getAddUpDeductionService(user).getAccountedEmployeeData(format); - for(AddUpSituation item : list){ + for (AddUpSituation item : list) { if (CollectionUtils.isNotEmpty(employees)) { Optional optionalAcctEmp = employees.stream().filter(f -> f.getEmployeeId().equals(item.getEmployeeId()) && f.getTaxAgentId().equals(item.getTaxAgentId())).findFirst(); if (optionalAcctEmp.isPresent()) { @@ -1137,11 +1195,11 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation ids.add(addUpSituationParam.getId()); AddUpSituationQueryParam build = AddUpSituationQueryParam.builder().ids(ids).build(); List list = biz.recordList(build); - if(list == null || list.size()==0){ + if (list == null || list.size() == 0) { throw new SalaryRunTimeException("该数据不存在！"); } String taxAgentName = list.get(0).getTaxAgentName(); - if(!taxAgentNames.contains(taxAgentName)){ + if (!taxAgentNames.contains(taxAgentName)) { throw new SalaryRunTimeException("您无权查看该数据!"); } return list.get(0); diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index dbe2e113b..e8cd2de13 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -5,7 +5,9 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.OtherDeductionBiz; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.OtherDeductionListDTO; @@ -15,6 +17,7 @@ import com.engine.salary.entity.datacollection.po.OtherDeductionPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.datacollection.OtherDeductionMapper; @@ -370,6 +373,66 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction return apidatas; } + /** + * 处理导入数据 + * + * @param pos + */ + public void handleImportData(List pos) { + if (CollectionUtils.isEmpty(pos)) { + return; + } + OtherDeductionBiz otherDeductionBiz = new OtherDeductionBiz(); + OtherDeductionPO po = pos.get(0); + // 多条相同人的则以第一条为准，如果逆序排列（用于重复的则以最后一条为准）Collections.reverse(pos); + // 去重（通过记录的唯一条件(申报月份，人员id，个税扣缴义务人id)拼接） + List finalPos = pos.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getEmployeeId() + "-" + f.getTaxAgentId()))), ArrayList::new)); + // 查询已有数据 + List list = otherDeductionBiz.listSome(OtherDeductionPO.builder().declareMonth(po.getDeclareMonth()).build()); + // 待修改的 本地已存在则更新【交集】 + List updateList = list.stream().map(m -> { + Optional optional = finalPos.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); + OtherDeductionPO temp = null; + if (optional.isPresent()) { + temp = optional.get(); + // 换成本地库的id + temp.setId(m.getId()); + } + return temp; + }).filter(Objects::nonNull).collect(Collectors.toList()); + // 待新增的 导入比本地多，则新增【差集(导入 - local)】 + List saveList = finalPos.stream().map(m -> { + Optional optional = list.stream().filter(p -> (p.getEmployeeId() + "-" + p.getTaxAgentId()).equals(m.getEmployeeId() + "-" + m.getTaxAgentId())).findFirst(); + OtherDeductionPO temp = null; + if (!optional.isPresent()) { + temp = m; + } + return temp; + }).filter(Objects::nonNull).collect(Collectors.toList()); + + // 修改 + if (CollectionUtils.isNotEmpty(updateList)) { + otherDeductionBiz.batchUpdate(updateList); + } + // 保存 + if (CollectionUtils.isNotEmpty(saveList)) { + otherDeductionBiz.batchSave(saveList); + } + // 记录操作日志 + saveList.addAll(updateList); + + if (CollectionUtils.isNotEmpty(saveList)) { + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 100351, "新增累计专项附加扣除")); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 100351, "新增计专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 100351, "新增累计专项附加扣除")); + loggerContext.setNewValueList(saveList); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + } + } + private void checkImportParam(OtherDeductionImportParam importParam) { //excel文件id String imageId = Util.null2String(importParam.getImageId()); @@ -513,7 +576,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction */ private List> getExcelRowDetailList(OtherDeductionQueryParam param) { //excel标题 - List title = Arrays.asList("姓名", "申报月份", "个税扣缴义务人", "部门", "手机号", "工号", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额","个人养老金"); + List title = Arrays.asList("姓名", "申报月份", "个税扣缴义务人", "部门", "手机号", "工号", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额", "个人养老金"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); //查询详细信息 @@ -676,7 +739,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } insertData.add(po); //入库 - OtherDeductionBiz.handleImportData(insertData); + handleImportData(insertData); } @Override diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 36cf1186f..b6ca36e33 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -7,7 +7,6 @@ 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.elog.util.LoggerTemplate; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO; import com.engine.salary.entity.salaryacct.dto.SalaryAcctEmployeeCountDTO; @@ -55,7 +54,6 @@ import java.util.stream.Collectors; **/ @Slf4j public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcctEmployeeService { - private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private SalaryAcctEmployeeMapper getSalaryAcctEmployeeMapper() { return MapperProxyFactory.getProxy(SalaryAcctEmployeeMapper.class); @@ -403,7 +401,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员") + ":" + targetName); loggerContext.setNewValueList(salaryAcctEmployeePOS); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } @Override @@ -470,7 +468,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员") + ":" + targetName); loggerContext.setOldValueList(salaryAcctEmployeePOS); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index a4c1a8512..3ce380565 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -9,7 +9,6 @@ import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SalaryItemConstant; import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.report.po.SalaryAcctResultReportPO; import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO; @@ -46,6 +45,7 @@ import com.engine.salary.util.JsonUtil; 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.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtilPlus; @@ -55,7 +55,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.wbi.util.Util; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; @@ -87,7 +86,6 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; **/ @Slf4j public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExcelService { - private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private SalaryAcctRecordService getSalaryAcctRecordService(User user) { return (SalaryAcctRecordService) ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user); @@ -259,7 +257,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员") + ":" + targetName); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 1d3e300ef..c13e6ca71 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -6,7 +6,6 @@ import com.engine.core.impl.Service; import com.engine.salary.common.LocalDateRange; import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.entity.salaryBill.po.SalarySendPO; import com.engine.salary.entity.salaryacct.bo.SalaryAcctRecordBO; import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam; @@ -52,7 +51,6 @@ import java.util.stream.Collectors; * @version 1.0 **/ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRecordService { - private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private SalaryAcctRecordMapper getSalaryAcctRecordMapper() { return MapperProxyFactory.getProxy(SalaryAcctRecordMapper.class); @@ -309,7 +307,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算") + ": " + targetName); loggerContext.setNewValues(salaryAcctRecordPO); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); // 返回薪资核算记录id return salaryAcctRecordPO.getId(); } @@ -543,7 +541,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算") + ":" + targetName); loggerContext.setNewValues(salaryAcctRecordPO); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); }); } @@ -585,7 +583,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档") + ": " + targetName); loggerContext.setNewValues(salaryAcctRecordPO); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } @Override @@ -635,7 +633,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98820, "重新核算")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98820, "重新核算") + ": " + targetName); loggerContext.setNewValues(salaryAcctRecordPO); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 2f5bd2403..d0527642e 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -86,7 +86,6 @@ import java.util.stream.Collectors; **/ @Slf4j public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctResultService { - private final LoggerTemplate salaryAcctRecordLoggerTemplate = SalaryElogConfig.salaryAcctRecordLoggerTemplate(); private EncryptUtil encryptUtil = new EncryptUtil(); private SalaryAcctResultMapper getSalaryAcctResultMapper() { @@ -665,7 +664,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); loggerContext.setNewValueList(Lists.newArrayList(salaryAcctResultPOS)); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } /** @@ -869,7 +868,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); - salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } catch (Exception e) { log.info("薪资核算出错：{}", e.getMessage(), e); // throw new SalaryRunTimeException(e); diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index db4639b2c..c43393c10 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -7,7 +7,6 @@ import com.engine.salary.biz.SalaryItemBiz; import com.engine.salary.biz.SysSalaryItemBiz; import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.entity.salaryformula.po.FormulaPO; import com.engine.salary.entity.salaryformula.po.FormulaVar; import com.engine.salary.entity.salaryitem.bo.SalaryItemBO; @@ -80,9 +79,6 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService return ServiceUtil.getService(SalarySobServiceImpl.class, user); } - private LoggerTemplate salaryItemLoggerTemplate = SalaryElogConfig.salaryItemLoggerTemplate(); - - private SysSalaryItemBiz sysSalaryItemBiz = new SysSalaryItemBiz(); // @Autowired // private LoggerTemplate salaryItemLoggerTemplate; @@ -217,7 +213,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目") + ": " + salaryItemPO.getName()); loggerContext.setNewValues(salaryItemPO); - salaryItemLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); } @Override @@ -301,7 +297,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目") + ": " + newSalaryItemPO.getName()); loggerContext.setOldValues(salaryItemPO); loggerContext.setNewValues(newSalaryItemPO); - salaryItemLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); } private void changeName(SalaryItemPO salaryItemPO, String oldName, String newName, String itemPrefix, String fieldNamePrefix) { @@ -365,7 +361,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目") + ": " + salaryItemPO.getName()); loggerContext.setOldValues(salaryItemPO); - salaryItemLoggerTemplate.write(loggerContext); + SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); }); } diff --git a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java index 989fc9ce7..c068f377d 100644 --- a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java @@ -2,10 +2,13 @@ package com.engine.salary.service.impl; import com.engine.core.impl.Service; import com.engine.salary.biz.SalarySobAdjustRuleBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salarysob.bo.SalarySobAdjustRuleBO; import com.engine.salary.entity.salarysob.param.SalarySobAdjustRuleSaveParam; import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO; import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salarysob.SalarySobAdjustRuleMapper; import com.engine.salary.mapper.salarysob.SalarySobMapper; @@ -40,7 +43,6 @@ public class SalarySobAdjustRuleServiceImpl extends Service implements SalarySob return MapperProxyFactory.getProxy(SalarySobAdjustRuleMapper.class); } -// private LoggerTemplate salarySobLoggerTemplate; @Override public List listBySalarySobId(Long salarySobId) { @@ -76,20 +78,13 @@ public class SalarySobAdjustRuleServiceImpl extends Service implements SalarySob salarySobAdjustRuleMapper.batchInsert(salarySobAdjustRulePOS); } // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(salarySobPO.getId())); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98614, "保存调薪计薪规则")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98614, "保存调薪计薪规则")); -// salarySobLoggerTemplate.write(loggerContext); -// } catch (Exception e) { -// sqlSession.rollback(); -// throw new SalaryRunTimeException(e); -// }finally { -// sqlSession.commit(); -// sqlSession.close(); -// } + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(String.valueOf(salarySobPO.getId())); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98614, "保存调薪计薪规则")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98614, "保存调薪计薪规则")); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java index 58f90b4e2..7d22fe009 100644 --- a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java @@ -3,12 +3,15 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SalarySobCheckRuleBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salarysob.bo.SalarySobCheckRuleBO; import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleQueryParam; import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleSaveParam; import com.engine.salary.entity.salarysob.param.UpdateCheckRuleFormulaParam; import com.engine.salary.entity.salarysob.po.SalarySobCheckRulePO; import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.SalarySobCheckRuleService; import com.engine.salary.service.SalarySobService; @@ -37,7 +40,6 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC private SalarySobService getSalarySobService(User user) { return (SalarySobService) ServiceUtil.getService(SalarySobServiceImpl.class, user); } -// private LoggerTemplate salarySobLoggerTemplate; @Override public SalarySobCheckRulePO getById(Long id) { @@ -84,15 +86,15 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC SalarySobCheckRulePO salarySobCheckRulePO = SalarySobCheckRuleBO.convert2PO(saveParam, (long) user.getUID()); // 保存 salarySobCheckRuleMapper.insert(salarySobCheckRulePO); - //todo 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93872, "添加校验规则")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93872, "添加校验规则") + ": " + salarySobCheckRulePO.getName()); -// loggerContext.setNewValues(salarySobCheckRulePO); -// salarySobLoggerTemplate.write(loggerContext); + //记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId("" + salarySobPO.getId()); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93872, "添加校验规则")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93872, "添加校验规则") + ": " + salarySobCheckRulePO.getName()); + loggerContext.setNewValues(salarySobCheckRulePO); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } @Override @@ -129,15 +131,16 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC newSalarySobCheckRulePO.setUpdateTime(new Date()); salarySobCheckRuleMapper.updateById(newSalarySobCheckRulePO); //todo 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则") + ": " + newSalarySobCheckRulePO.getName()); -// loggerContext.setOldValues(salarySobCheckRulePO); -// loggerContext.setNewValues(newSalarySobCheckRulePO); -// salarySobLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salarySobPO.getId()); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则") + ": " + newSalarySobCheckRulePO.getName()); + loggerContext.setOldValues(salarySobCheckRulePO); + loggerContext.setNewValues(newSalarySobCheckRulePO); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } @Override @@ -175,17 +178,18 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC // 将薪资账套list转换成map Map salarySobPOMap = SalaryEntityUtil.convert2Map(salarySobPOS, SalarySobPO::getId); //todo 记录日志 -// salarySobCheckRulePOS.forEach(salarySobCheckRulePO -> { -// SalarySobPO salarySobPO = salarySobPOMap.get(salarySobCheckRulePO.getSalarySobId()); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则") + ": " + salarySobCheckRulePO.getName()); -// loggerContext.setOldValues(salarySobCheckRulePO); -// salarySobLoggerTemplate.write(loggerContext); -// }); + salarySobCheckRulePOS.forEach(salarySobCheckRulePO -> { + SalarySobPO salarySobPO = salarySobPOMap.get(salarySobCheckRulePO.getSalarySobId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salarySobPO.getId()); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则") + ": " + salarySobCheckRulePO.getName()); + loggerContext.setOldValues(salarySobCheckRulePO); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); + }); } @Override diff --git a/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java index 78d313366..e959b3fd6 100644 --- a/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobExtRangeServiceImpl.java @@ -59,8 +59,6 @@ public class SalarySobExtRangeServiceImpl extends Service implements SalarySobEx return SqlProxyHandle.getProxy(SalarySobExtRangeMapper.class); } -// private ComInfoCache comInfoCache; -// private LoggerTemplate salarySobLoggerTemplate; @Override public List listByIds(Collection ids) { diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index 268912117..216e6499e 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -6,7 +6,9 @@ import com.engine.salary.biz.SalarySobBiz; import com.engine.salary.biz.SalarySobItemBiz; import com.engine.salary.biz.SalarySobItemGroupBiz; import com.engine.salary.biz.SalarySobItemHideBiz; +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.salaryformula.ExpressFormula; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.bo.SalarySobItemAggregateBO; @@ -15,6 +17,7 @@ import com.engine.salary.entity.salarysob.dto.SalarySobItemFormDTO; import com.engine.salary.entity.salarysob.param.SalarySobItemSaveParam; import com.engine.salary.entity.salarysob.po.*; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salarysob.SalarySobDefaultItemMapper; @@ -23,9 +26,9 @@ import com.engine.salary.mapper.salarysob.SalarySobItemMapper; import com.engine.salary.service.*; 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.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.StringUtils; @@ -93,7 +96,6 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe private SalarySobDefaultItemMapper getSalarySobDefaultItemMapper() { return MapperProxyFactory.getProxy(SalarySobDefaultItemMapper.class); } -// private LoggerTemplate salarySobLoggerTemplate; @Override public List list() { @@ -260,14 +262,17 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe //保存 saveSobItem(saveParam); - //todo 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目")); -// salarySobLoggerTemplate.write(loggerContext); + SalarySobPO salarySob = salarySobBiz.getById(salarySobId); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salarySob.getId()); + loggerContext.setTargetName(salarySob.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目")); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } /** diff --git a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java index 257ab6d72..ef2caa4d8 100644 --- a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java @@ -6,6 +6,8 @@ import com.engine.core.impl.Service; import com.engine.hrm.biz.OrganizationShowSetBiz; import com.engine.salary.biz.SalarySobRangeBiz; import com.engine.salary.biz.SpecialAddDeductionBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.hrm.DeptInfo; import com.engine.salary.entity.hrm.PositionInfo; @@ -20,6 +22,7 @@ import com.engine.salary.entity.salarysob.param.SalarySobRangeSaveParam; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.salarysob.po.SalarySobRangePO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum; import com.engine.salary.enums.salarysob.TargetTypeEnum; @@ -87,10 +90,6 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange private SalarySobExtRangeMapper getSalarySobExtRangeMapper() { return SqlProxyHandle.getProxy(SalarySobExtRangeMapper.class); } - -// private ComInfoCache comInfoCache; -// private LoggerTemplate salarySobLoggerTemplate; - @Override public List listByIds(Collection ids) { if (CollectionUtils.isEmpty(ids)) { @@ -185,17 +184,18 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange if (CollectionUtils.isNotEmpty(result.getNeedUpdateSalarySobRanges())) { result.getNeedUpdateSalarySobRanges().forEach(e -> salarySobRangeBiz.updateById(e)); } - // todo 记录日志 -// String operateTypeName = Objects.equals(saveParam.getIncludeType(), NumberUtils.INTEGER_ONE) ? -// SalaryI18nUtil.getI18nLabel(98601, "关联人员范围新增对象") : SalaryI18nUtil.getI18nLabel(98602, "从范围中排除新增对象"); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(operateTypeName); -// loggerContext.setOperatedesc(operateTypeName); -// loggerContext.setNewValues(saveParam); -// salarySobLoggerTemplate.write(loggerContext); + //记录日志 + String operateTypeName = Objects.equals(saveParam.getIncludeType(), 1) ? + SalaryI18nUtil.getI18nLabel(98601, "关联人员范围新增对象") : SalaryI18nUtil.getI18nLabel(98602, "从范围中排除新增对象"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salarySobPO.getId()); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(operateTypeName); + loggerContext.setOperatedesc(operateTypeName); + loggerContext.setNewValues(saveParam); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java index 2c0f56bb0..18f1500ab 100644 --- a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java @@ -3,9 +3,12 @@ package com.engine.salary.service.impl; import com.engine.core.impl.Service; import com.engine.salary.biz.SalaryItemBiz; import com.engine.salary.biz.SysSalaryItemBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.SalarySystemTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salaryitem.SysSalaryItemMapper; @@ -30,7 +33,6 @@ import java.util.Set; * @version 1.0 **/ public class SysSalaryItemServiceImpl extends Service implements SysSalaryItemService { - private SysSalaryItemBiz sysSalaryItemMapper = new SysSalaryItemBiz(); private SalaryItemBiz salaryItemService = new SalaryItemBiz(); @@ -87,19 +89,20 @@ public class SysSalaryItemServiceImpl extends Service implements SysSalaryItemSe throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98350, "已经添加过的系统薪资项目不能重复添加")); } // 保存 - List salaryItems = SysSalaryItemBO.convert2SalaryItemPO(sysSalaryItemPOS,(long)user.getUID()); + List salaryItems = SysSalaryItemBO.convert2SalaryItemPO(sysSalaryItemPOS, (long) user.getUID()); salaryItemService.batchSave(salaryItems); - //todo 记录日志 -// sysSalaryItemPOS.forEach(sysSalaryItemPO -> { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(sysSalaryItemPO.getId())); -// loggerContext.setTargetName(sysSalaryItemPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目") + ": " + sysSalaryItemPO.getName()); -// loggerContext.setNewValues(sysSalaryItemPO); -// salaryItemLoggerTemplate.write(loggerContext); -// }); + // 记录日志 + sysSalaryItemPOS.forEach(sysSalaryItemPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(sysSalaryItemPO.getId())); + loggerContext.setTargetName(sysSalaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目") + ": " + sysSalaryItemPO.getName()); + loggerContext.setNewValues(sysSalaryItemPO); + SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); + }); } @Override diff --git a/src/com/engine/salary/util/SalaryLoggerUtil.java b/src/com/engine/salary/util/SalaryLoggerUtil.java index e8d0c60de..e6d49943f 100644 --- a/src/com/engine/salary/util/SalaryLoggerUtil.java +++ b/src/com/engine/salary/util/SalaryLoggerUtil.java @@ -1,73 +1,80 @@ package com.engine.salary.util; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.elog.util.LoggerTemplate; +import com.engine.salary.enums.OperateTypeEnum; + /** - * @Description: 操作日志工具类 - * @Author: wangxiangzhong - * @Date: 2021/11/1 11:31 - */ + * 操作日志工具类 + *

Copyright: Copyright (c) 2023

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class SalaryLoggerUtil { -// /** -// * 记录单个对象新增操作日志 -// * @param loggerTemplate -// * @param targetId -// * @param targetName -// * @param operateTypeName -// * @param operatedesc -// * @param newValues -// */ -// public static void recordAddSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object newValues) { -// recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.ADD.getValue(), operateTypeName, operatedesc, null, newValues); -// } -// -// /** -// * 记录单个对象修改操作日志 -// * @param loggerTemplate -// * @param targetId -// * @param targetName -// * @param operateTypeName -// * @param operatedesc -// * @param oldValues -// * @param newValues -// */ -// public static void recordUpdateSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues, Object newValues) { -// recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.UPDATE.getValue(), operateTypeName, operatedesc, oldValues, newValues); -// } -// -// /** -// * 记录单个对象删除操作日志 -// * @param loggerTemplate -// * @param targetId -// * @param targetName -// * @param operateTypeName -// * @param operatedesc -// * @param oldValues -// */ -// public static void recordDeleteSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues) { -// recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.DELETE.getValue(), operateTypeName, operatedesc, oldValues, null); -// } -// -// /** -// * 记录单个对象日志 -// * @param loggerTemplate -// * @param targetId -// * @param targetName -// * @param operateType -// * @param operateTypeName -// * @param operatedesc -// * @param oldValues -// * @param newValues -// */ -// private static void recoreSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateType, String operateTypeName, String operatedesc, Object oldValues, Object newValues) { -// LoggerContext loggerContext = new LoggerContext(); -// loggerContext.setTargetId(String.valueOf(targetId)); -// loggerContext.setTargetName(targetName); -// loggerContext.setOperateType(operateType); -// loggerContext.setOperateTypeName(operateTypeName); -// loggerContext.setOperatedesc(operatedesc); -// loggerContext.setOldValues(oldValues); -// loggerContext.setNewValues(newValues); -// loggerTemplate.write(loggerContext); -// } + /** + * 记录单个对象新增操作日志 + * @param loggerTemplate + * @param targetId + * @param targetName + * @param operateTypeName + * @param operatedesc + * @param newValues + */ + public static void recordAddSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object newValues) { + recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.ADD.getValue(), operateTypeName, operatedesc, null, newValues); + } + + /** + * 记录单个对象修改操作日志 + * @param loggerTemplate + * @param targetId + * @param targetName + * @param operateTypeName + * @param operatedesc + * @param oldValues + * @param newValues + */ + public static void recordUpdateSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues, Object newValues) { + recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.UPDATE.getValue(), operateTypeName, operatedesc, oldValues, newValues); + } + + /** + * 记录单个对象删除操作日志 + * @param loggerTemplate + * @param targetId + * @param targetName + * @param operateTypeName + * @param operatedesc + * @param oldValues + */ + public static void recordDeleteSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues) { + recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.DELETE.getValue(), operateTypeName, operatedesc, oldValues, null); + } + + /** + * 记录单个对象日志 + * @param loggerTemplate + * @param targetId + * @param targetName + * @param operateType + * @param operateTypeName + * @param operatedesc + * @param oldValues + * @param newValues + */ + private static void recoreSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateType, String operateTypeName, String operatedesc, Object oldValues, Object newValues) { + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setTargetId(String.valueOf(targetId)); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(operateType); + loggerContext.setOperateTypeName(operateTypeName); + loggerContext.setOperatedesc(operatedesc); + loggerContext.setOldValues(oldValues); + loggerContext.setNewValues(newValues); + loggerTemplate.write(loggerContext); + } } From 65f972846faca8d235811c2f0b5cb80ef38928e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 30 Jan 2024 10:26:44 +0800 Subject: [PATCH 076/169] =?UTF-8?q?=E5=A4=84=E7=90=86id=E8=B6=85=E8=BF=872?= =?UTF-8?q?100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryAcctEmployeeQueryParam.java | 2 +- .../impl/SalaryAcctEmployeeServiceImpl.java | 27 +++++++++++++++++-- .../impl/SalaryAcctResultServiceImpl.java | 6 ++--- .../SalaryComparisonResultServiceImpl.java | 2 +- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java index cfe97aae9..81266c2d3 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java @@ -57,7 +57,7 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam { private LocalDateRange dismissDate; //薪资核算人员列表主键id") - private Collection ids; + private List ids; private String workcode; } diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index a0da13747..2991cf398 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.salary.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; @@ -288,7 +289,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct List salaryAcctEmployeePOS = listByParam(queryParam); Set keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId()); List resultList = Lists.newArrayList(); - if(CollectionUtils.isNotEmpty(keySet)){ + if (CollectionUtils.isNotEmpty(keySet)) { lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> { if (!keySet.contains(k)) { resultList.add(v); @@ -336,7 +337,18 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct // 查询合并计税的薪资核算人员 Set otherSalaryAcctRecordIds = SalaryEntityUtil.properties(otherSalaryAcctRecordPOS, SalaryAcctRecordPO::getId); // 分页参数 - List salaryAcctEmployeePOS = getSalaryAcctEmployeeMapper().listPage4ConsolidatedTax(otherSalaryAcctRecordIds, queryParam); + List salaryAcctEmployeePOS = new ArrayList<>(); + if (CollUtil.isNotEmpty(queryParam.getIds())) { + List list = new ArrayList<>(); + List> partition = Lists.partition(queryParam.getIds(), 500); + partition.forEach(ids -> { + queryParam.setIds(ids); + list.addAll(getSalaryAcctEmployeeMapper().list4ConsolidatedTax(otherSalaryAcctRecordIds, queryParam)); + }); + salaryAcctEmployeePOS = list; + } else { + salaryAcctEmployeePOS = getSalaryAcctEmployeeMapper().listPage4ConsolidatedTax(otherSalaryAcctRecordIds, queryParam); + } return SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), salaryAcctEmployeePOS, SalaryAcctEmployeePO.class); } @@ -353,6 +365,17 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct } // 查询合并计税的薪资核算人员 Set otherSalaryAcctRecordIds = SalaryEntityUtil.properties(otherSalaryAcctRecordPOS, SalaryAcctRecordPO::getId); + + List list = new ArrayList<>(); + if (CollUtil.isNotEmpty(queryParam.getIds())) { + List> partition = Lists.partition(queryParam.getIds(), 500); + partition.forEach(ids -> { + queryParam.setIds(ids); + list.addAll(getSalaryAcctEmployeeMapper().list4ConsolidatedTax(otherSalaryAcctRecordIds, queryParam)); + }); + return list; + } + return getSalaryAcctEmployeeMapper().list4ConsolidatedTax(otherSalaryAcctRecordIds, queryParam); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 6fcd32486..6cf502c44 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -355,7 +355,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe //其他条件 List otherConditions = queryParam.getOtherConditions(); - if(CollectionUtils.isNotEmpty(otherConditions)){ + if (CollectionUtils.isNotEmpty(otherConditions)) { List items = SalaryEntityUtil.properties(otherConditions, SalaryAcctResultQueryParam.OtherCondition::getItemId, Collectors.toList()); List list = listBySalaryAcctRecordIdsAndSalaryItemIds(Collections.singletonList(queryParam.getSalaryAcctRecordId()), items); for (int i = 0; i < otherConditions.size(); i++) { @@ -470,7 +470,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe salaryAcctEmployeeIds4ConsolidatedTax = SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId); } else { // 如果查询条件中没有包含"合并计税"，那么就需要查询出存在合并计税的人，标记给前端 - SalaryAcctEmployeeQueryParam accEmployeeQueryParam = SalaryAcctEmployeeQueryParam.builder().salaryAcctRecordId(queryParam.getSalaryAcctRecordId()).ids(SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId)).build(); + SalaryAcctEmployeeQueryParam accEmployeeQueryParam = SalaryAcctEmployeeQueryParam.builder().salaryAcctRecordId(queryParam.getSalaryAcctRecordId()).ids(SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId, Collectors.toList())).build(); List salaryAcctEmployeePOS4ConsolidatedTax = getSalaryAcctEmployeeService(user).listByParam4ConsolidatedTax(accEmployeeQueryParam); salaryAcctEmployeeIds4ConsolidatedTax = SalaryEntityUtil.properties(salaryAcctEmployeePOS4ConsolidatedTax, SalaryAcctEmployeePO::getId); } @@ -1191,7 +1191,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe batchSave(needInsertList); // 报表入库前先删除 - getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(param.getIdList(), Collections.singletonList(param.getSalaryItemId()) ); + getSalaryAcctReportService(user).deleteByAcctEmployeeIdsAndSalaryItemIds(param.getIdList(), Collections.singletonList(param.getSalaryItemId())); getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS); } diff --git a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java index 25e926aaf..3f3c3fd71 100644 --- a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java @@ -215,7 +215,7 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary } else { SalaryAcctEmployeeQueryParam accEmployeeQueryParam = SalaryAcctEmployeeQueryParam.builder() .salaryAcctRecordId(queryParam.getSalaryAcctRecordId()) - .ids(SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId)) + .ids(SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId, Collectors.toList())) .build(); List salaryAcctEmployeePOS4ConsolidatedTax = getSalaryAcctEmployeeService(user).listByParam4ConsolidatedTax(accEmployeeQueryParam); salaryAcctEmployeeIds4ConsolidatedTax = SalaryEntityUtil.properties(salaryAcctEmployeePOS4ConsolidatedTax, SalaryAcctEmployeePO::getId); From e5a0a8517988b89649d868dd53a1e08b0a081dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 30 Jan 2024 11:18:54 +0800 Subject: [PATCH 077/169] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=96=AA?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=EF=BC=8C=E6=99=8B=E5=8D=87=E3=80=81=E9=99=8D?= =?UTF-8?q?=E8=81=8C=E3=80=81=E8=B0=83=E5=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SalaryArchiveItemAdjustReasonEnum.java | 3 + .../impl/SalaryArchiveExcelServiceImpl.java | 2 +- src/com/engine/salary/util/EnumUtil.java | 357 ++++++++++++++++++ 3 files changed, 361 insertions(+), 1 deletion(-) create mode 100644 src/com/engine/salary/util/EnumUtil.java diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java index 373999a91..fb3f761cc 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java @@ -19,6 +19,9 @@ public enum SalaryArchiveItemAdjustReasonEnum implements BaseEnum { ONBOARD("ONBOARD", "入职", 85901), PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984), SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985), + PROMOTION("SALARY_ADJUSTMENT", "晋升", 85985), + DEMOTION("SALARY_ADJUSTMENT", "降职", 85985), + JOB_TRANSFER("SALARY_ADJUSTMENT", "调岗", 85985), POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", "调岗调薪", 85986), DIMISSION("DIMISSION", "离职", 85902), OTHER("OTHER", "其他", 84500), diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java index 87137b0e8..001f5ee36 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java @@ -404,7 +404,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'"))); excelComments.add(new ExcelComment(8, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); } else if (isSalaryItemAdjust) { - excelComments.add(new ExcelComment(6, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "必填,可填写如:入职,转正,调薪,调岗调薪,离职,其他,初始化"))); + excelComments.add(new ExcelComment(6, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "必填,可填写如:入职,转正,调薪,晋升,降职,调岗,调岗调薪,离职,其他,初始化"))); excelComments.add(new ExcelComment(7, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); } } else if (isSuspendList) { diff --git a/src/com/engine/salary/util/EnumUtil.java b/src/com/engine/salary/util/EnumUtil.java new file mode 100644 index 000000000..aad5269e0 --- /dev/null +++ b/src/com/engine/salary/util/EnumUtil.java @@ -0,0 +1,357 @@ +package com.engine.salary.util; + + +import lombok.extern.slf4j.Slf4j; +import sun.reflect.ConstructorAccessor; +import sun.reflect.FieldAccessor; +import sun.reflect.MethodAccessor; +import sun.reflect.ReflectionFactory; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@Slf4j +public class EnumUtil { + + /** + * 扩展枚举（把新枚举的值加入旧枚举里，从旧枚举里删除不要的枚举值） + * @param oldEnumClass 旧枚举类 + * @param newEnumClass 需要扩展的枚举类 + * @param removeOldEnums 需要删除的旧枚举值 + * @param + * @param + * @throws Exception + */ + public static void extendEnum(Class oldEnumClass,Class newEnumClass,O... removeOldEnums) throws Exception { + boolean needToRemoveOldEnum = removeOldEnums!=null&&removeOldEnums.length>0; + if(needToRemoveOldEnum){ + removeEnum(oldEnumClass,removeOldEnums); + } + List newEnums = values(newEnumClass); + Field[] fields = getFields(newEnumClass); + for (Object newEnumObject : newEnums) { + Enum newEnum = Enum.class.cast(newEnumObject); + + List fieldTypeList = new ArrayList<>(); + //枚举名称的类型：String.class + fieldTypeList.add(String.class); + for (Field field : fields) { + fieldTypeList.add(field.getType()); + } + List fieldValueList = new ArrayList<>(); + //枚举名称 + fieldValueList.add(newEnum.name()); + for (Field field : fields) { + Object value = field.get(newEnum); + fieldValueList.add(value); + } + + Class[] fieldTypes = fieldTypeList.toArray(new Class[]{}); + String[] fieldValues = fieldValueList.toArray(new String[]{}); + addEnum(oldEnumClass,fieldTypes,fieldValues); + } + } + + /** + * 新增枚举值 + * @param enumClass 枚举类型 + * @param fieldTypes 字段的类型，第一个是枚举名类型String + * @param fieldValues 字段的值，第一个是枚举名称 + * @throws Exception + */ + public static > T addEnum(Class enumClass, Class[] fieldTypes, Object[] fieldValues) throws Exception { + if(fieldTypes==null||fieldTypes.length==0){ + throw new RuntimeException("参数fieldTypes为空"); + } + if(fieldValues==null||fieldValues.length==0){ + throw new RuntimeException("参数fieldValues为空"); + } + if(fieldTypes[0]!=String.class){ + throw new RuntimeException("参数fieldTypes[0]不是String.class"); + } + if(!(fieldValues[0] instanceof String)){ + throw new RuntimeException("参数fieldValues[0]不是字符串"); + } + if(fieldTypes.length!=fieldValues.length){ + throw new RuntimeException("参数fieldTypes和参数fieldValues的长度不一致"); + } + ReflectionFactory reflectionFactory = ReflectionFactory.getReflectionFactory(); + String enumName = fieldValues[0].toString(); + synchronized (enumClass){ + //判断name是否已经添加过了 + if(hasEnumName(enumClass,enumName)){ + log.info("枚举类{}中已存在该枚举名：{}",enumClass.getSimpleName(),enumName); + return getEnum(enumClass,enumName); + } + //name,ordinal,其他自定义字段 + List allFieldClass = new ArrayList<>(fieldTypes.length + 1); + allFieldClass.add(String.class); + allFieldClass.add(int.class); + for (int i = 1; i < fieldTypes.length; i++) { + allFieldClass.add(fieldTypes[i]); + } + Class[] classes = allFieldClass.toArray(new Class[]{}); + Constructor constructor = enumClass.getDeclaredConstructor(classes); + ConstructorAccessor constructorAccessor = reflectionFactory.newConstructorAccessor(constructor); + List allFields = new ArrayList<>(fieldValues.length + 1); + allFields.add(enumName); + int maxOrdinal = getMaxOrdinal(enumClass); + allFields.add(maxOrdinal+1); + for (int i = 1; i < fieldValues.length; i++) { + allFields.add(fieldValues[i]); + } + //调用枚举的构造方法，创建新的枚举值 + T newEnum = (T) constructorAccessor.newInstance(allFields.toArray()); + log.info("新增枚举：{}" , newEnum); + Field valuesField = enumClass.getDeclaredField("$VALUES"); + valuesField.setAccessible(true); + + //解除values属性的final限制 + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + int modifiers = modifiersField.getInt(valuesField); + modifiers &= ~Modifier.FINAL; + modifiersField.setInt(valuesField, modifiers); + + //将新增的枚举值加入values属性里 + FieldAccessor fieldAccessor = reflectionFactory.newFieldAccessor(valuesField, false); + T[] ts = (T[]) fieldAccessor.get(enumClass); + List list = new ArrayList<>(Arrays.asList(ts)); + list.add(newEnum); + fieldAccessor.set(enumClass, list.toArray(ts)); + + //将Class对象的enumConstants和enumConstantDirectory清空（Enum.valueOf()方法会给它们赋值） + /** + * Enum.valueOf()逻辑： + * 1.取enumConstantDirectory + * 1.1如果有值则直接返回 + * 1.2如果没值，则取enumConstants，并拷贝到enumConstantDirectory，下次可直接返回 + * 1.2.1如果enumConstants有值，则返回 + * 1.2.2如果enumConstants没值，则取枚举的values属性，并拷贝到enumConstants，下次可直接返回 + * 2.enumConstantDirectory.get(name)返回 + */ + Field enumConstantDirectoryField = enumClass.getClass().getDeclaredField("enumConstantDirectory"); + enumConstantDirectoryField.setAccessible(true); + FieldAccessor enumConstantDirectoryFieldAccessor = reflectionFactory.newFieldAccessor(enumConstantDirectoryField, false); + enumConstantDirectoryFieldAccessor.set(enumClass,null); + Field enumConstantsField = enumClass.getClass().getDeclaredField("enumConstants"); + enumConstantsField.setAccessible(true); + FieldAccessor enumConstantsFieldAccessor = reflectionFactory.newFieldAccessor(enumConstantsField, false); + enumConstantsFieldAccessor.set(enumClass,null); + return newEnum; + } + } + + /** + * 获取枚举类当前最大序号 + * @param enumClass 枚举类型 + * @param + * @return + * @throws Exception + */ + public static > int getMaxOrdinal(Class enumClass) throws Exception { + List values = values(enumClass); + if(values==null||values.size()==0){ + return 0; + } + int maxOrdinal = 0; + for (T value : values) { + if(maxOrdinal + */ + public static > void removeEnum(Class enumClass, Enum... removeOldEnums) throws Exception { + if(removeOldEnums==null||removeOldEnums.length==0){ + log.warn("removeOldEnums为空"); + return; + } + ReflectionFactory reflectionFactory = ReflectionFactory.getReflectionFactory(); + synchronized (enumClass){ + Field valuesField = enumClass.getDeclaredField("$VALUES"); + valuesField.setAccessible(true); + + //解除values属性的final限制 + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + int modifiers = modifiersField.getInt(valuesField); + modifiers &= ~Modifier.FINAL; + modifiersField.setInt(valuesField, modifiers); + + FieldAccessor fieldAccessor = reflectionFactory.newFieldAccessor(valuesField, false); + T[] oldEnumArray = (T[]) fieldAccessor.get(enumClass); + List enumList = new ArrayList<>(Arrays.asList(oldEnumArray)); + for (Enum removeOldEnum : removeOldEnums) { + //将指定的枚举值从values属性里删除 + enumList.remove(removeOldEnum); + log.info("删除枚举值：{}",removeOldEnum); + } + //把List转成数组 + T[] newEnumArray = (T[]) Arrays.copyOf(enumList.toArray(), enumList.size(), oldEnumArray.getClass()); + fieldAccessor.set(enumClass, newEnumArray); + } + } + /** + * 修改枚举属性 + * @param enumClass 枚举类型 + * @param enumName 枚举名称 + * @param attributeName 属性名 + * @param attributeValue 属性值 + * @param + * @throws Exception + */ + public static > void setAttribute(Class enumClass,String enumName,String attributeName,Object attributeValue) throws Exception { + List values = values(enumClass); + T target = null; + for (T t:values){ + if(t.name().equals(enumName)){ + target = t; + break; + } + } + if(target==null){ + throw new RuntimeException("该枚举类没有枚举名："+enumName); + } + Field declaredField = target.getClass().getDeclaredField(attributeName); + declaredField.setAccessible(true); + declaredField.set(target,attributeValue); + } + + /** + * 修改枚举属性 + * @param targetEnum 枚举值 + * @param attributeName 属性名 + * @param attributeValue 属性值 + * @param + * @throws Exception + */ + public static > void setAttribute(T targetEnum,String attributeName,Object attributeValue) throws Exception { + Field declaredField = targetEnum.getClass().getDeclaredField(attributeName); + declaredField.setAccessible(true); + declaredField.set(targetEnum,attributeValue); + } + + /** + * 判断枚举类是否包含了指定枚举名 + * @param clazz + * @param enumName + * @param + * @return + */ + public static > boolean hasEnumName(Class clazz, String enumName) throws Exception { +// 不要用valueOf方法，因为它会初始化enumConstantDirectory使得后续调用valueOf方法后拿不到后面加入的枚举值 +// try{ +// T t = Enum.valueOf(clazz, enumName); +// if(t!=null){ +// return true; +// } +// }catch (Exception e){ +// e.printStackTrace(); +// System.err.println(e.getMessage()); +// } + List values = values(clazz); + for (T t:values){ + if(t.name().equals(enumName)){ + return true; + } + } + return false; + } + + /** + * 根据枚举类型和枚举名获取枚举值 + * @param clazz 枚举类型 + * @param enumName 枚举名称 + * @param + * @return + * @throws Exception + */ + public static > T getEnum(Class clazz, String enumName) throws Exception { + List values = values(clazz); + for (T t:values){ + if(t.name().equals(enumName)){ + return t; + } + } + return null; + } + + /** + * 获取枚举类的所有枚举值 + * @param clazz 枚举类型 + * @param + * @return + * @throws Exception + */ + public static > List values(Class clazz) throws Exception { + ReflectionFactory reflectionFactory = ReflectionFactory.getReflectionFactory(); + Field valuesField = clazz.getDeclaredField("$VALUES"); + valuesField.setAccessible(true); + FieldAccessor fieldAccessor = reflectionFactory.newFieldAccessor(valuesField, false); + T[] ts = (T[]) fieldAccessor.get(clazz); + List list = new ArrayList<>(Arrays.asList(ts)); + return list; + } + + /** + * 获取枚举类的所有枚举值 + * @param clazz 枚举类型 + * @param + * @return + * @throws Exception + */ + public static > List values2(Class clazz) throws Exception { + ReflectionFactory reflectionFactory = ReflectionFactory.getReflectionFactory(); + Method valuesMethod = clazz.getDeclaredMethod("values"); + valuesMethod.setAccessible(true); + MethodAccessor methodAccessor = reflectionFactory.newMethodAccessor(valuesMethod); + T[] ts = (T[]) methodAccessor.invoke(clazz, null); + List list = new ArrayList<>(Arrays.asList(ts)); + return list; + } + + /** + * 获取枚举的字段（排除数组类型、枚举类型） + * @param enumClass + * @return + */ + public static Field[] getFields(Class enumClass){ + List result = new ArrayList<>(); + Field[] declaredFields = enumClass.getDeclaredFields(); + for (Field field : declaredFields) { + Class type = field.getType(); + //排除数组类型(values)、枚举类型(枚举值) + if(type!=enumClass && !type.isArray()){ + field.setAccessible(true); + result.add(field); + } + } + return result.toArray(new Field[]{}); + } + + /** + * 打印枚举值 + * @param enumClass 枚举类型 + * @throws Exception + */ + public static void printEnum(Class enumClass) throws Exception { + System.out.println("+++++++++++++++++++++++"); + List values = values(enumClass); + values.stream().forEach(System.out::println); + System.out.println("+++++++++++++++++++++++"); + } + +} From 12f66512df934de30844e5b47af87b0133c50d65 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 30 Jan 2024 13:50:05 +0800 Subject: [PATCH 078/169] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=8C=BA=E5=88=86pc=E5=92=8C=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java | 2 +- .../salary/mapper/salarybill/SalaryTemplateMapper.xml | 1 + .../service/impl/SalaryBillBaseSetServiceImpl.java | 6 +++--- .../salary/service/impl/SalarySendServiceImpl.java | 2 +- src/com/engine/salary/wrapper/SalaryTemplateWrapper.java | 9 ++++++++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java index 767d6ccac..fc9a7abf4 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java @@ -31,7 +31,7 @@ public class SalaryBillAckFeedbackDTO { /** * 移动端反馈地址 */ - private String mobileFeedBackUrl; + private String mobileFeedbackUrl; /** * 超时自动确认天数 diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 07898826c..538ae335e 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -59,6 +59,7 @@ , t.ack_feedback_status , t.auto_ack_days , t.feedback_url + , t.mobile_feedback_url , t.create_time , t.update_time , t.creator diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java index 5cafea060..9400d83cc 100644 --- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java @@ -100,7 +100,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) { // 2.保存反馈地址 getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedBackUrl(), SALARY_FEEDBACK_URL, "工资单反馈地址", "billSend"); - getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getMobileFeedBackUrl(), SALARY_FEEDBACK_URL_MOBILE, "移动端工资单反馈地址", "billSend"); + getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getMobileFeedbackUrl(), SALARY_FEEDBACK_URL_MOBILE, "移动端工资单反馈地址", "billSend"); // 3.保存自动确认时间 getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend"); } @@ -138,7 +138,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB defaultAckFeedBackDTO.setAckStatus("0"); defaultAckFeedBackDTO.setAutoAckDays(0); defaultAckFeedBackDTO.setFeedBackUrl("/"); - defaultAckFeedBackDTO.setMobileFeedBackUrl("/"); + defaultAckFeedBackDTO.setMobileFeedbackUrl("/"); return defaultAckFeedBackDTO; } defaultAckFeedBackDTO.setAckStatus(ackStatus); @@ -150,7 +150,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB defaultAckFeedBackDTO.setFeedBackUrl(feedbackUrl); String mobileFeedbackUrl = sysConfMap.getOrDefault(SALARY_FEEDBACK_URL_MOBILE, ""); - defaultAckFeedBackDTO.setMobileFeedBackUrl(mobileFeedbackUrl); + defaultAckFeedBackDTO.setMobileFeedbackUrl(mobileFeedbackUrl); return defaultAckFeedBackDTO; } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 2a5f9b688..f79d2b74b 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -830,7 +830,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService .ackFeedbackStatus(Integer.valueOf(map.getOrDefault("ackFeedbackStatus", "0").toString())) .autoAckDays(Integer.valueOf(map.getOrDefault("autoAckDays", "0").toString())) .feedbackUrl(map.getOrDefault("feedbackUrl", "").toString()) - .feedbackUrl(map.getOrDefault("mobileFeedbackUrl", "").toString()) + .mobileFeedbackUrl(map.getOrDefault("mobileFeedbackUrl", "").toString()) .name(map.getOrDefault("name", "").toString()) .salarySobId(Long.valueOf(map.getOrDefault("salarySobId", "0").toString())) .useType(Integer.valueOf(map.getOrDefault("useType", "0").toString())) diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 22aac4134..25a0d96ef 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -176,6 +176,7 @@ public class SalaryTemplateWrapper extends Service { } + // 查询所有启用的薪资账套 List salarySobs = getSalarySobService(user).listByDisable(NumberUtils.INTEGER_ZERO); List> salarySobOptions = salarySobs.stream().map(salarySobPO -> { @@ -199,8 +200,14 @@ public class SalaryTemplateWrapper extends Service { salaryTemplateBaseSetDTO.setAckFeedbackStatus(StringUtils.equals(defaultAckFeedback.getAckStatus(), "1")); salaryTemplateBaseSetDTO.setAutoAckDays(defaultAckFeedback.getAutoAckDays()); salaryTemplateBaseSetDTO.setFeedbackUrl(defaultAckFeedback.getFeedBackUrl()); - salaryTemplateBaseSetDTO.setMobileFeedbackUrl(defaultAckFeedback.getMobileFeedBackUrl()); + salaryTemplateBaseSetDTO.setMobileFeedbackUrl(defaultAckFeedback.getMobileFeedbackUrl()); } + + // 如果设置了pc端反馈流程地址，移动端没有设置,则移动端与pc端一致 + if (StringUtils.isNotBlank(salaryTemplateBaseSetDTO.getFeedbackUrl()) && StringUtils.isBlank(salaryTemplateBaseSetDTO.getMobileFeedbackUrl())) { + salaryTemplateBaseSetDTO.setMobileFeedbackUrl(salaryTemplateBaseSetDTO.getFeedbackUrl()); + } + Map salaryTemplateBase = new HashMap<>(); salaryTemplateBase.put("data", salaryTemplateBaseSetDTO); salaryTemplateBase.put("salarySobOptions", salarySobOptions); From b6f7281cbd3e42637c3a9c75dca0435ada6a765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 30 Jan 2024 14:17:06 +0800 Subject: [PATCH 079/169] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalarySobRangeServiceImpl.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java index ef2caa4d8..0e30a3fd9 100644 --- a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java @@ -209,21 +209,22 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange // 删除薪资账套的人员范围 salarySobRangeBiz.deleteByIds(ids); // 查询薪资账套 -// Set salarySobIds = SalaryEntityUtil.properties(salarySobRangePOS, SalarySobRangePO::getSalarySobId); -// List salarySobPOS = getSalarySobService(user).listByIds(salarySobIds); -// // 是"关联人员范围"还是"从范围中排除" -// Integer includeType = salarySobRangePOS.get(0).getIncludeType(); -// // todo 记录日志 -// String operateTypeName = Objects.equals(includeType, NumberUtils.INTEGER_ONE) ? -// SalaryI18nUtil.getI18nLabel(98605, "关联人员范围删除对象") : SalaryI18nUtil.getI18nLabel(98606, "从范围中排除删除对象"); -// salarySobPOS.forEach(salarySobPO -> { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(operateTypeName); -// loggerContext.setOperatedesc(operateTypeName); -// }); + Set salarySobIds = SalaryEntityUtil.properties(salarySobRangePOS, SalarySobRangePO::getSalarySobId); + List salarySobPOS = getSalarySobService(user).listByIds(salarySobIds); + // 是"关联人员范围"还是"从范围中排除" + Integer includeType = salarySobRangePOS.get(0).getIncludeType(); + //记录日志 + String operateTypeName = Objects.equals(includeType, 1) ? + SalaryI18nUtil.getI18nLabel(98605, "关联人员范围删除对象") : SalaryI18nUtil.getI18nLabel(98606, "从范围中排除删除对象"); + salarySobPOS.forEach(salarySobPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salarySobPO.getId()); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(operateTypeName); + loggerContext.setOperatedesc(operateTypeName); + }); } @Override From b1d3d2c445d276208d6b02b78eeb384115c6e5db Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 30 Jan 2024 14:31:21 +0800 Subject: [PATCH 080/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=A4=8D=E5=88=B6?= =?UTF-8?q?action=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/CopyToPaySIArchiveAction.java | 149 ++++++++++++++++++ .../mapper/siarchives/OtherSchemeMapper.java | 7 + .../mapper/siarchives/OtherSchemeMapper.xml | 9 ++ .../salary/service/SIArchivesService.java | 9 ++ .../service/impl/SIArchivesServiceImpl.java | 124 +++++++++++++++ 5 files changed, 298 insertions(+) create mode 100644 src/com/engine/salary/action/CopyToPaySIArchiveAction.java diff --git a/src/com/engine/salary/action/CopyToPaySIArchiveAction.java b/src/com/engine/salary/action/CopyToPaySIArchiveAction.java new file mode 100644 index 000000000..6ff38ee6d --- /dev/null +++ b/src/com/engine/salary/action/CopyToPaySIArchiveAction.java @@ -0,0 +1,149 @@ +package com.engine.salary.action; + +import cn.hutool.core.util.StrUtil; +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; +import com.engine.salary.service.SIArchivesService; +import com.engine.salary.service.impl.SIArchivesServiceImpl; +import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 拷贝福利档案并置为在缴 + * @Date: 2024/1/29 + **/ +@Slf4j +public class CopyToPaySIArchiveAction implements Action { + + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + + private SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class,user); + } + + private String tableName; + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = fieldMap.get(processField); + list.add(new CopyToPaySIArchiveAction.SalaryField(processField, salaryName, value)); + } + List> importData = new ArrayList<>(); + importData.add(SalaryEntityUtil.convert2Map(list, CopyToPaySIArchiveAction.SalaryField::getSalaryName, CopyToPaySIArchiveAction.SalaryField::getValue)); + //操作人 + String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(CopyToPaySIArchiveAction.SalaryField::getValue).orElse("1"); + //增员 + String toCopyTaxAgentName = importData.get(0).get("待复制个税扣缴义务人").toString(); + String toUpdateTaxAgentName = importData.get(0).get("待更新个税扣缴义务人").toString(); + String payStartYearMonth = importData.get(0).getOrDefault("起始缴纳月", "").toString(); + if (StrUtil.isNotBlank(payStartYearMonth) && !SalaryDateUtil.checkYearMonth(payStartYearMonth)) { + requestInfo.getRequestManager().setMessage("起始缴纳月格式有误，正确格式示例为'2021-01'"); + return FAILURE_AND_CONTINUE; + } + + List toCopyTaxAgentPOS = getTaxAgentMapper().listByName(toCopyTaxAgentName); + List toUpdateTaxAgentPOS = getTaxAgentMapper().listByName(toUpdateTaxAgentName); + if(CollectionUtils.isEmpty(toCopyTaxAgentPOS)){ + requestInfo.getRequestManager().setMessage("待复制个税扣缴义务人不存在！"); + return FAILURE_AND_CONTINUE; + } + if(CollectionUtils.isEmpty(toUpdateTaxAgentPOS)){ + requestInfo.getRequestManager().setMessage("待更新个税扣缴义务人不存在！"); + return FAILURE_AND_CONTINUE; + } + Long toCopyTaxAgentId = toCopyTaxAgentPOS.get(0).getId(); + Long toUpdateTaxAgentId = toUpdateTaxAgentPOS.get(0).getId(); + Long employeeId = Long.valueOf(list.stream().filter(f -> f.salaryName.equals("员工id")).findFirst().map(CopyToPaySIArchiveAction.SalaryField::getValue).orElse("-1")); + User user = new User(Integer.parseInt(uid)); + //拷贝福利档案并置为在缴 + Map resultMap = getSIArchivesService(user).copyToPay(toCopyTaxAgentId, toUpdateTaxAgentId, employeeId, payStartYearMonth); + if (!"success".equals(resultMap.get("type").toString())) { + requestInfo.getRequestManager().setMessage(resultMap.get("msg").toString()); + return FAILURE_AND_CONTINUE; + } + + } catch (Exception e) { + log.error("福利档案复制并置为在缴异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java index f468b0d45..6ad9fbe78 100644 --- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java +++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java @@ -36,6 +36,13 @@ public interface OtherSchemeMapper { */ List getOtherById(@Param("ids")List ids); + /** + * 根据id获取单条 + * @param id + * @return + */ + InsuranceArchivesOtherSchemePO getOneById(@Param("id")Long id); + /** * 批量删除 * @param singletonList diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml index 2d67257b4..12adf7fb4 100644 --- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml @@ -80,6 +80,15 @@ + + + UPDATE hrsa_other_archives diff --git a/src/com/engine/salary/service/SIArchivesService.java b/src/com/engine/salary/service/SIArchivesService.java index 0bdc90cd9..7f2f31866 100644 --- a/src/com/engine/salary/service/SIArchivesService.java +++ b/src/com/engine/salary/service/SIArchivesService.java @@ -94,6 +94,15 @@ public interface SIArchivesService { */ Map stayAddToPay(Collection ids); + /** + * 拷贝福利档案到新的个税扣缴义务人并置为在缴 + * @param toCopyTaxAgentId 被拷贝的福利档案所属个税扣缴义务人id + * @param toUpdateTaxAgentId 被更新的福利档案所属个税扣缴义务人id + * @param employeeId 福利档案所属人员id + * @return + */ + Map copyToPay(Long toCopyTaxAgentId, Long toUpdateTaxAgentId, Long employeeId, String payStartYearMonth); + /** * 待减员页面的删除待办 */ diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 6e1f5e94a..8871548f4 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -6,6 +6,7 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.cmd.siarchives.SIArchivesTipsCmd; +import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBaseInfoBO; import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseHistoryDTO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; @@ -71,6 +72,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + private EncryptUtil encryptUtil = new EncryptUtil(); + private TaxAgentService getTaxAgentService(User user) { return ServiceUtil.getService(TaxAgentServiceImpl.class, user); } @@ -1217,4 +1220,125 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return listPage; } + /** + * 拷贝福利档案到新的个税扣缴义务人并置为在缴 + */ + @Override + public Map copyToPay(Long toCopyTaxAgentId, Long toUpdateTaxAgentId, Long employeeId, String payStartYearMonth) { + if (toCopyTaxAgentId == null || toUpdateTaxAgentId == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人不能为空")); + } + if (employeeId == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "人员id不能为空")); + } + //获取待拷贝的福利档案明细 + InsuranceArchivesBaseInfoPO toCopyBaseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(toCopyTaxAgentId, employeeId); + if(toCopyBaseInfoPO == null){ + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "待复制个税扣缴义务人下该员工不存在福利档案，请检查后重试！")); + } + InsuranceArchivesSocialSchemePO toCopySocialInfo = getSocialSchemeMapper().getOneById(toCopyBaseInfoPO.getSocialArchivesId()); + InsuranceArchivesFundSchemePO toCopyFundInfo = getFundSchemeMapper().getOneById(toCopyBaseInfoPO.getFundArchivesId()); + InsuranceArchivesOtherSchemePO toCopyOtherInfo = getOtherSchemeMapper().getOneById(toCopyBaseInfoPO.getOtherArchivesId()); + //获取待更新的福利档案 + InsuranceArchivesBaseInfoPO toUpdateBaseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(toUpdateTaxAgentId, employeeId); + if(toUpdateBaseInfoPO == null){ + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "待更新个税扣缴义务人下该员工不存在福利档案，请检查后重试！")); + } + InsuranceArchivesSocialSchemePO toUpdateSocialInfo = getSocialSchemeMapper().getOneById(toUpdateBaseInfoPO.getSocialArchivesId()); + InsuranceArchivesFundSchemePO toUpdateFundInfo = getFundSchemeMapper().getOneById(toUpdateBaseInfoPO.getFundArchivesId()); + InsuranceArchivesOtherSchemePO toUpdateOtherInfo = getOtherSchemeMapper().getOneById(toUpdateBaseInfoPO.getOtherArchivesId()); + //设置福利档案基数调整记录数据 + encryptUtil.decrypt(toCopySocialInfo, InsuranceArchivesSocialSchemePO.class); + encryptUtil.decrypt(toUpdateSocialInfo, InsuranceArchivesSocialSchemePO.class); + encryptUtil.decrypt(toCopyFundInfo, InsuranceArchivesFundSchemePO.class); + encryptUtil.decrypt(toUpdateFundInfo, InsuranceArchivesFundSchemePO.class); + encryptUtil.decrypt(toCopyOtherInfo, InsuranceArchivesOtherSchemePO.class); + encryptUtil.decrypt(toUpdateOtherInfo, InsuranceArchivesOtherSchemePO.class); + + InsuranceArchivesBaseHistoryDTO socialAdjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(toCopySocialInfo.getSocialSchemeId()) + .adjustAfterBaseJson(toCopySocialInfo.getSocialPaymentBaseString()) + .adjustAfterComBaseJson(toCopySocialInfo.getSocialPaymentComBaseString()) + .welfareType(toUpdateSocialInfo.getWelfareType()) + .employeeId(toUpdateSocialInfo.getEmployeeId()) + .paymentOrganization(toUpdateSocialInfo.getPaymentOrganization()) + .adjustBeforeSchemeId(toUpdateSocialInfo.getSocialSchemeId()) + .adjustBeforeBaseJson(toUpdateSocialInfo.getSocialPaymentBaseString()) + .adjustBeforeComBaseJson(toUpdateSocialInfo.getSocialPaymentComBaseString()) + .build(); + InsuranceArchivesBaseHistoryDTO fundAdjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(toCopyFundInfo.getFundSchemeId()) + .adjustAfterBaseJson(toCopyFundInfo.getFundPaymentBaseString()) + .adjustAfterComBaseJson(toCopyFundInfo.getFundPaymentComBaseString()) + .welfareType(toUpdateFundInfo.getWelfareType()) + .employeeId(toUpdateFundInfo.getEmployeeId()) + .paymentOrganization(toUpdateFundInfo.getPaymentOrganization()) + .adjustBeforeSchemeId(toUpdateFundInfo.getFundSchemeId()) + .adjustBeforeBaseJson(toUpdateFundInfo.getFundPaymentBaseString()) + .adjustBeforeComBaseJson(toUpdateFundInfo.getFundPaymentComBaseString()) + .build(); + InsuranceArchivesBaseHistoryDTO otherAdjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(toCopyOtherInfo.getOtherSchemeId()) + .adjustAfterBaseJson(toCopyOtherInfo.getOtherPaymentBaseString()) + .adjustAfterComBaseJson(toCopyOtherInfo.getOtherPaymentComBaseString()) + .welfareType(toUpdateOtherInfo.getWelfareType()) + .employeeId(toUpdateOtherInfo.getEmployeeId()) + .paymentOrganization(toUpdateOtherInfo.getPaymentOrganization()) + .adjustBeforeSchemeId(toUpdateOtherInfo.getOtherSchemeId()) + .adjustBeforeBaseJson(toUpdateOtherInfo.getOtherPaymentBaseString()) + .adjustBeforeComBaseJson(toUpdateOtherInfo.getOtherPaymentComBaseString()) + .build(); + List adjustHistoryList = new ArrayList<>(); + adjustHistoryList.addAll(siArchivesBiz.createAdjustInfo(socialAdjustInfo, (long) user.getUID())); + adjustHistoryList.addAll(siArchivesBiz.createAdjustInfo(fundAdjustInfo, (long) user.getUID())); + adjustHistoryList.addAll(siArchivesBiz.createAdjustInfo(otherAdjustInfo, (long) user.getUID())); + //更新字段 + toUpdateBaseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + + toUpdateSocialInfo.setSocialAccount(toCopySocialInfo.getSocialAccount()); + toUpdateSocialInfo.setSocialSchemeId(toCopySocialInfo.getSocialSchemeId()); + toUpdateSocialInfo.setSocialPaymentBaseString(toCopySocialInfo.getSocialPaymentBaseString()); + toUpdateSocialInfo.setSocialPaymentComBaseString(toCopySocialInfo.getSocialPaymentComBaseString()); + toUpdateSocialInfo.setNonPayment(toCopySocialInfo.getNonPayment()); + toUpdateSocialInfo.setUnderTake(toCopySocialInfo.getUnderTake()); + toUpdateSocialInfo.setSocialStartTime(StringUtils.isNotBlank(payStartYearMonth) ? payStartYearMonth : toCopySocialInfo.getSocialStartTime()); + toUpdateSocialInfo.setUpdateTime(new Date()); + + toUpdateFundInfo.setFundAccount(toCopyFundInfo.getFundAccount()); + toUpdateFundInfo.setSupplementFundAccount(toCopyFundInfo.getSupplementFundAccount()); + toUpdateFundInfo.setFundSchemeId(toCopyFundInfo.getFundSchemeId()); + toUpdateFundInfo.setFundPaymentBaseString(toCopyFundInfo.getFundPaymentBaseString()); + toUpdateFundInfo.setFundPaymentComBaseString(toCopyFundInfo.getFundPaymentComBaseString()); + toUpdateFundInfo.setNonPayment(toCopyFundInfo.getNonPayment()); + toUpdateFundInfo.setUnderTake(toCopyFundInfo.getUnderTake()); + toUpdateFundInfo.setFundStartTime(StringUtils.isNotBlank(payStartYearMonth) ? payStartYearMonth : toCopyFundInfo.getFundStartTime()); + toUpdateFundInfo.setUpdateTime(new Date()); + + toUpdateOtherInfo.setOtherSchemeId(toCopyOtherInfo.getOtherSchemeId()); + toUpdateOtherInfo.setOtherPaymentBaseString(toCopyOtherInfo.getOtherPaymentBaseString()); + toUpdateOtherInfo.setOtherPaymentComBaseString(toCopyOtherInfo.getOtherPaymentComBaseString()); + toUpdateOtherInfo.setNonPayment(toCopyOtherInfo.getNonPayment()); + toUpdateOtherInfo.setUnderTake(toCopyOtherInfo.getUnderTake()); + toUpdateOtherInfo.setOtherStartTime(StringUtils.isNotBlank(payStartYearMonth) ? payStartYearMonth : toCopyOtherInfo.getOtherStartTime()); + toUpdateOtherInfo.setUpdateTime(new Date()); + //档案入库 + encryptUtil.encrypt(toUpdateSocialInfo, InsuranceArchivesSocialSchemePO.class); + encryptUtil.encrypt(toUpdateFundInfo, InsuranceArchivesFundSchemePO.class); + encryptUtil.encrypt(toUpdateOtherInfo, InsuranceArchivesOtherSchemePO.class); + + getInsuranceBaseInfoMapper().updateById(toUpdateBaseInfoPO); + getSocialSchemeMapper().updateById(toUpdateSocialInfo); + getFundSchemeMapper().updateById(toUpdateFundInfo); + getOtherSchemeMapper().updateById(toUpdateOtherInfo); + //基数调整记录入库 + siArchivesBiz.batchInsertAdjustHistory(adjustHistoryList, (long) user.getUID()); + + Map resultMap = new HashMap<>(2); + String resultMsg = "操作成功"; + String resultType = "success"; + + resultMap.put("type", resultType); + resultMap.put("msg", resultMsg); + return resultMap; + } } From 336aaeabea3274ca67f11ed28f19feaf8e19d180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 30 Jan 2024 15:45:48 +0800 Subject: [PATCH 081/169] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E6=9C=AB=E5=B0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryStatisticsReportServiceImpl.java | 6 +++--- .../wrapper/SalaryStatisticsReportWrapper.java | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 5819ce821..261e6292b 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -31,13 +31,13 @@ import com.engine.salary.report.util.ReportTimeUtil; import com.engine.salary.service.*; import com.engine.salary.service.impl.*; 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; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -472,7 +472,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary Map> salaryAcctEmpResultMap = SalaryEntityUtil.group2Map(salaryAcctResultValues, SalaryAcctResultPO::getSalaryAcctEmpId); Map> map = new HashMap<>(); salaryAcctEmpResultMap.forEach((k, v) -> { - Map collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), p -> Util.null2o(p.getResultValue()), (key1, key2) -> key2)); + Map collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), p -> Util.null2String(p.getResultValue()), (key1, key2) -> key2)); map.put(k, collect); }); @@ -1937,7 +1937,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary Map sameEmpIdYearMap = new HashMap<>(); String dimensionValue = data.getDimensionValue(); - dimensionSet.forEach(k -> { + dimensionSet.stream().sorted((a,b)->b.length()-a.length()).forEach(k -> { if (dimensionValue == null) { List salaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getList(), empIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()); List lastSalaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getLastList(), lastEmpIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList()); diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java index 0da317ee9..508877028 100644 --- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java +++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java @@ -319,13 +319,13 @@ public class SalaryStatisticsReportWrapper extends Service { //已缓存的报表id String salaryReportIds = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_IDS)); String salaryReportConditions = ""; -// 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)) { -// return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); -// } -// } + 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)) { + return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5); + } + } // 列表data From 2331ef354ef3d50b3089cf1398398d9f444f2003 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 30 Jan 2024 15:53:55 +0800 Subject: [PATCH 082/169] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=92=8C=E5=8F=8D=E9=A6=88=E6=8C=89=E9=92=AE=E5=88=86?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryBill/bo/SalaryTemplateBO.java | 1 + .../dto/SalaryBillAckFeedbackDTO.java | 7 +++- .../dto/SalaryTemplateBaseSetDTO.java | 5 +++ .../param/SalaryTemplateSaveParam.java | 7 +++- .../salaryBill/po/SalaryTemplatePO.java | 5 +++ .../salarybill/SalaryTemplateMapper.xml | 17 ++++++++ .../impl/SalaryBillBaseSetServiceImpl.java | 39 ++++++++++++------- .../service/impl/SalarySendServiceImpl.java | 39 +++++++++++++++---- .../impl/SalaryTemplateServiceImpl.java | 1 + .../sys/constant/SalarySysConstant.java | 7 +++- .../salary/wrapper/SalaryTemplateWrapper.java | 7 ++++ 11 files changed, 111 insertions(+), 24 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java index 32fd9f0d6..d436117c1 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java @@ -78,6 +78,7 @@ public class SalaryTemplateBO { .autoSendDayOfMonth(saveParam.getAutoSendDayOfMonth()) .autoSendTimeOfDay(saveParam.getAutoSendTimeOfDay()) .ackFeedbackStatus(saveParam.getAckFeedbackStatus()?1:0) + .ackFeedbackStatus(saveParam.getFeedbackStatus()?1:0) .autoAckDays(saveParam.getAutoAckDays()) .feedbackUrl(saveParam.getFeedbackUrl()) .mobileFeedbackUrl(saveParam.getMobileFeedbackUrl()) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java index fc9a7abf4..15b336d69 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryBillAckFeedbackDTO.java @@ -18,10 +18,15 @@ import lombok.NoArgsConstructor; public class SalaryBillAckFeedbackDTO { /** - * 工资单确认反馈是否开启。0：否，1：是 + * 工资单确认是否开启。0：否，1：是 */ private String ackStatus; + /** + * 工资单反馈是否开启。0：否，1：是 + */ + private String feedbackStatus; + /** * 反馈地址 */ diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java index 47f4eb854..93f0ec5e6 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateBaseSetDTO.java @@ -82,6 +82,11 @@ public class SalaryTemplateBaseSetDTO { */ private Boolean ackFeedbackStatus; + /** + * 工资单确认反馈状态 + */ + private Boolean feedbackStatus; + /** * 自动确认超时天数 */ diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java index df1996e6d..2f5bbb11a 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java @@ -96,10 +96,15 @@ public class SalaryTemplateSaveParam { private List replenishSalaryItemSetting; /** - * 工资单确认反馈状态 + * 工资单确认状态 */ private Boolean ackFeedbackStatus; + /** + * 工资单反馈状态 + */ + private Boolean feedbackStatus; + /** * 自动确认超时天数 */ diff --git a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java index 5ffcbaf24..6057d23f5 100644 --- a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java +++ b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java @@ -180,6 +180,11 @@ public class SalaryTemplatePO { */ private Integer ackFeedbackStatus; + /** + * 工资单确认反馈状态 + */ + private Integer feedbackStatus; + /** * 自动确认超时天数 */ diff --git a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml index 538ae335e..31cbf0088 100644 --- a/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalaryTemplateMapper.xml @@ -57,6 +57,7 @@ , t.auto_send_day_of_month , t.auto_send_time_of_day , t.ack_feedback_status + , t.feedback_status , t.auto_ack_days , t.feedback_url , t.mobile_feedback_url @@ -91,6 +92,7 @@ auto_send_day_of_month, auto_send_time_of_day, ack_feedback_status, + feedback_status, auto_ack_days, feedback_url, mobile_feedback_url, @@ -530,6 +532,9 @@ ack_feedback_status=#{ackFeedbackStatus}, + + feedback_status=#{feedbackStatus}, + auto_ack_days=#{autoAckDays}, @@ -635,6 +640,9 @@ ack_feedback_status, + + feedback_status, + auto_ack_days, @@ -736,6 +744,9 @@ #{ackFeedbackStatus}, + + #{feedbackStatus}, + #{autoAckDays}, @@ -847,6 +858,9 @@ ack_feedback_status, + + feedback_status, + auto_ack_days, @@ -948,6 +962,9 @@ #{ackFeedbackStatus}, + + #{feedbackStatus}, + #{autoAckDays}, diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java index 9400d83cc..581b8f20d 100644 --- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java @@ -96,13 +96,17 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB // 工资单确认和反馈 =========================================================== SalaryBillAckFeedbackDTO ackFeedbackSetting = saveParam.getAckFeedbackSetting(); // 1.保存确认反馈开关状态 - getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK, "工资单确认反馈状态", "billSend"); + getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK, "工资单确认状态", "billSend"); + getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend"); if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) { - // 2.保存反馈地址 + // 保存自动确认时间 + getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend"); + } + + if (StringUtils.equals(ackFeedbackSetting.getFeedbackStatus(), "1")) { + // 保存反馈地址 getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedBackUrl(), SALARY_FEEDBACK_URL, "工资单反馈地址", "billSend"); getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getMobileFeedbackUrl(), SALARY_FEEDBACK_URL_MOBILE, "移动端工资单反馈地址", "billSend"); - // 3.保存自动确认时间 - getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend"); } // 工资单时效性设置 @@ -127,21 +131,30 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB @Override public SalaryBillAckFeedbackDTO getDefaultAckFeedbackSetting() { // 获取反馈开启状态、自动确认时长、反馈地址 - List codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL, SALARY_FEEDBACK_URL_MOBILE); + List codes = Arrays.asList(SalarySysConstant.SALARY_SEND_FEEDBACK, SalarySysConstant.SALARY_SEND_FEEDBACK_FK ,SalarySysConstant.SALARY_AUTO_ACK_DAYS, SalarySysConstant.SALARY_FEEDBACK_URL, SALARY_FEEDBACK_URL_MOBILE); List sysConfList = getSalarySysConfService(user).getListByCodes(codes); Map sysConfMap = SalaryEntityUtil.convert2Map(sysConfList, SalarySysConfPO::getConfKey, SalarySysConfPO::getConfValue); SalaryBillAckFeedbackDTO defaultAckFeedBackDTO = SalaryBillAckFeedbackDTO.builder().build(); String ackStatus = sysConfMap.getOrDefault(SalarySysConstant.SALARY_SEND_FEEDBACK, "0"); - if (StringUtils.equals(ackStatus, "0")) { - // 未开启工资单确认 - defaultAckFeedBackDTO.setAckStatus("0"); - defaultAckFeedBackDTO.setAutoAckDays(0); - defaultAckFeedBackDTO.setFeedBackUrl("/"); - defaultAckFeedBackDTO.setMobileFeedbackUrl("/"); - return defaultAckFeedBackDTO; - } + // if (StringUtils.equals(ackStatus, "0")) { + // // 未开启工资单确认 + // defaultAckFeedBackDTO.setAckStatus("0"); + // defaultAckFeedBackDTO.setAutoAckDays(0); + // defaultAckFeedBackDTO.setFeedBackUrl("/"); + // defaultAckFeedBackDTO.setMobileFeedbackUrl("/"); + // return defaultAckFeedBackDTO; + // } defaultAckFeedBackDTO.setAckStatus(ackStatus); + + + String feedbackStatus = sysConfMap.get(SALARY_SEND_FEEDBACK_FK); + if (feedbackStatus == null) { + // 处理历史数据 + feedbackStatus = ackStatus; + } + defaultAckFeedBackDTO.setFeedbackStatus(feedbackStatus); + // 获取超时自动确认时间 Integer autoAckDays = Integer.valueOf(sysConfMap.getOrDefault(SalarySysConstant.SALARY_AUTO_ACK_DAYS, "7")); defaultAckFeedBackDTO.setAutoAckDays(autoAckDays); diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index f79d2b74b..fb68130fb 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -630,18 +630,34 @@ public class SalarySendServiceImpl extends Service implements SalarySendService handleSalaryWatermark(salaryTemplate, salarySendInfo, currentEmployeeId); map.put("salaryTemplate", salaryTemplate); map.put("salaryAcctResult", salaryAcctResultS); - // 工资单发送人、是否已确认 + + // 工资单确认按钮 if (NumberUtils.compare(salaryTemplate.getAckFeedbackStatus(), 1) == 0) { - // 反馈后还可以确认或反馈按钮，确认后2个按钮消失 - Integer confirmStatus = salarySendInfo.getBillConfirmStatus(); - if (confirmStatus == null || confirmStatus != BillConfimStatusEnum.CONFIRMED.getValue()) { - map.put("confirmStatus", "0"); + // 开启了工资单确认 + Integer ackStatus = salarySendInfo.getBillConfirmStatus(); + if (ackStatus == null || ackStatus != BillConfimStatusEnum.CONFIRMED.getValue()) { + map.put("showAck", "1"); } else { - map.put("confirmStatus", "1"); + map.put("showAck", "0"); } map.put("sendEmployeeId", salarySendInfo.getSendEmployeeId()); } else { - map.put("confirmStatus", "1"); + map.put("showAck", "0"); + } + + + // 工资单反馈 + if (NumberUtils.compare(salaryTemplate.getFeedbackStatus(), 1) == 0) { + // 开启了工资单反馈按钮 + Integer confirmStatus = salarySendInfo.getBillConfirmStatus(); + map.put("showFeedback", "1"); + // 除非确认状态为已确认否则可以一直反馈 + if (NumberUtils.compare(salaryTemplate.getAckFeedbackStatus(), 1) == 0 && confirmStatus != null && confirmStatus == BillConfimStatusEnum.CONFIRMED.getValue()) { + map.put("showFeedback", "0"); + } + map.put("sendEmployeeId", salarySendInfo.getSendEmployeeId()); + } else { + map.put("showFeedback", "0"); } return map; @@ -825,7 +841,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService */ private SalaryTemplatePO buildSalaryTemplateContent(String salaryTemplateContent) { Map map = JsonUtil.parseMap(salaryTemplateContent, Object.class); - return SalaryTemplatePO.builder() + SalaryTemplatePO build = SalaryTemplatePO.builder() .id(Long.valueOf(map.getOrDefault("id", "0").toString())) .ackFeedbackStatus(Integer.valueOf(map.getOrDefault("ackFeedbackStatus", "0").toString())) .autoAckDays(Integer.valueOf(map.getOrDefault("autoAckDays", "0").toString())) @@ -849,6 +865,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService .replenishName(map.getOrDefault("replenishName", "").toString()) .replenishSalaryItemSetting(map.getOrDefault("replenishSalaryItemSetting", "").toString()) .build(); + Object feedbackStatus = map.get("feedbackStatus"); + if (feedbackStatus == null) { + build.setFeedbackStatus(build.getAckFeedbackStatus()); + } else { + Integer.valueOf(map.get("ackFeedbackStatus").toString()); + } + return build; } /** diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index df24535aa..9243eced6 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -215,6 +215,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate salaryTemplateNew.setAutoSendStatus(saveParam.getAutoSendStatus() ? 1 : 0); salaryTemplateNew.setAutoSendCycleType(saveParam.getAutoSendCycleType()); salaryTemplateNew.setAckFeedbackStatus(saveParam.getAckFeedbackStatus() ? 1 : 0); + salaryTemplateNew.setAckFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0); salaryTemplateNew.setAutoAckDays(saveParam.getAutoAckDays()); salaryTemplateNew.setFeedbackUrl(saveParam.getFeedbackUrl()); salaryTemplateNew.setMobileFeedbackUrl(saveParam.getMobileFeedbackUrl()); diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index 081702d22..80ce94227 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -82,10 +82,15 @@ public class SalarySysConstant { public static final String SALARY_ARCHIVE_DELETE = "salaryArchiveDelete"; /** - * 工资单确认反馈状态 + * 工资单确认状态 */ public static final String SALARY_SEND_FEEDBACK = "SALARY_SEND_FEEDBACK"; + /** + * 工资单反馈状态 + */ + public static final String SALARY_SEND_FEEDBACK_FK = "SALARY_SEND_FEEDBACK_FK"; + /** * 工资单反馈自动确认 */ diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 25a0d96ef..c4b622c69 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -166,6 +166,12 @@ public class SalaryTemplateWrapper extends Service { salaryTemplateBaseSetDTO.setSendEmail(po.getSendEmailId()); salaryTemplateBaseSetDTO.setAutoSendStatus(po.getAutoSendStatus() != null && po.getAutoSendStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue())); salaryTemplateBaseSetDTO.setAckFeedbackStatus(po.getAckFeedbackStatus() != null && NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 0); + if (po.getFeedbackStatus() == null) { + salaryTemplateBaseSetDTO.setFeedbackStatus(salaryTemplateBaseSetDTO.getAckFeedbackStatus()); + } else { + salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 0); + } + salaryTemplateBaseSetDTO.setAutoAckDays(ObjectUtils.isEmpty(po.getAutoAckDays()) ? 7 : po.getAutoAckDays()); // 规则赋值 如果为ALL传“” 如果为byRule传薪资项目ID salaryTemplateBaseSetDTO.setReplenishRule(SalaryTemplateReplenishRuleEnum.ALL.getValue().equals(po.getReplenishRule()) ? "" : po.getReplenishRule()); @@ -199,6 +205,7 @@ public class SalaryTemplateWrapper extends Service { SalaryBillAckFeedbackDTO defaultAckFeedback = getSalaryBillBaseSetService(user).getDefaultAckFeedbackSetting(); salaryTemplateBaseSetDTO.setAckFeedbackStatus(StringUtils.equals(defaultAckFeedback.getAckStatus(), "1")); salaryTemplateBaseSetDTO.setAutoAckDays(defaultAckFeedback.getAutoAckDays()); + salaryTemplateBaseSetDTO.setFeedbackStatus(StringUtils.equals(defaultAckFeedback.getFeedbackStatus(), "1")); salaryTemplateBaseSetDTO.setFeedbackUrl(defaultAckFeedback.getFeedBackUrl()); salaryTemplateBaseSetDTO.setMobileFeedbackUrl(defaultAckFeedback.getMobileFeedbackUrl()); } From 3281b138faeb3bb4ea74e23cf42754f3d08317c5 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 30 Jan 2024 15:58:42 +0800 Subject: [PATCH 083/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=A4=8D=E5=88=B6?= =?UTF-8?q?action=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/action/CopyToPaySIArchiveAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/action/CopyToPaySIArchiveAction.java b/src/com/engine/salary/action/CopyToPaySIArchiveAction.java index 6ff38ee6d..2fcfb6596 100644 --- a/src/com/engine/salary/action/CopyToPaySIArchiveAction.java +++ b/src/com/engine/salary/action/CopyToPaySIArchiveAction.java @@ -91,8 +91,9 @@ public class CopyToPaySIArchiveAction implements Action { } Long toCopyTaxAgentId = toCopyTaxAgentPOS.get(0).getId(); Long toUpdateTaxAgentId = toUpdateTaxAgentPOS.get(0).getId(); - Long employeeId = Long.valueOf(list.stream().filter(f -> f.salaryName.equals("员工id")).findFirst().map(CopyToPaySIArchiveAction.SalaryField::getValue).orElse("-1")); + Long employeeId = Long.valueOf(list.stream().filter(f -> "员工id".equals(f.salaryName)).findFirst().map(CopyToPaySIArchiveAction.SalaryField::getValue).orElse("-1")); User user = new User(Integer.parseInt(uid)); + user.setLanguage(7); //拷贝福利档案并置为在缴 Map resultMap = getSIArchivesService(user).copyToPay(toCopyTaxAgentId, toUpdateTaxAgentId, employeeId, payStartYearMonth); if (!"success".equals(resultMap.get("type").toString())) { From acbffb205baa0477a3b9bf7ff28669d9cf20be2f Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 30 Jan 2024 16:00:50 +0800 Subject: [PATCH 084/169] sql --- resource/sqlupgrade/DM/sql202401300303.sql | 3 +++ resource/sqlupgrade/GS/sql202401300303.sql | 3 +++ resource/sqlupgrade/JC/sql202401300303.sql | 3 +++ resource/sqlupgrade/Mysql/sql202401300303.sql | 1 + resource/sqlupgrade/Oracle/sql202401300303.sql | 2 ++ resource/sqlupgrade/PG/sql202401300303.sql | 1 + resource/sqlupgrade/SQLServer/sql202401300303.sql | 2 ++ resource/sqlupgrade/ST/sql202401300303.sql | 3 +++ 8 files changed, 18 insertions(+) create mode 100644 resource/sqlupgrade/DM/sql202401300303.sql create mode 100644 resource/sqlupgrade/GS/sql202401300303.sql create mode 100644 resource/sqlupgrade/JC/sql202401300303.sql create mode 100644 resource/sqlupgrade/Mysql/sql202401300303.sql create mode 100644 resource/sqlupgrade/Oracle/sql202401300303.sql create mode 100644 resource/sqlupgrade/PG/sql202401300303.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202401300303.sql create mode 100644 resource/sqlupgrade/ST/sql202401300303.sql diff --git a/resource/sqlupgrade/DM/sql202401300303.sql b/resource/sqlupgrade/DM/sql202401300303.sql new file mode 100644 index 000000000..edf082294 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202401300303.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500); +/ + diff --git a/resource/sqlupgrade/GS/sql202401300303.sql b/resource/sqlupgrade/GS/sql202401300303.sql new file mode 100644 index 000000000..edf082294 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202401300303.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500); +/ + diff --git a/resource/sqlupgrade/JC/sql202401300303.sql b/resource/sqlupgrade/JC/sql202401300303.sql new file mode 100644 index 000000000..edf082294 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202401300303.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500); +/ + diff --git a/resource/sqlupgrade/Mysql/sql202401300303.sql b/resource/sqlupgrade/Mysql/sql202401300303.sql new file mode 100644 index 000000000..847c44d97 --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202401300303.sql @@ -0,0 +1 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500); \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202401300303.sql b/resource/sqlupgrade/Oracle/sql202401300303.sql new file mode 100644 index 000000000..6211d28fa --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202401300303.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500) +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202401300303.sql b/resource/sqlupgrade/PG/sql202401300303.sql new file mode 100644 index 000000000..847c44d97 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202401300303.sql @@ -0,0 +1 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500); \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202401300303.sql b/resource/sqlupgrade/SQLServer/sql202401300303.sql new file mode 100644 index 000000000..96f40257b --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202401300303.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500) +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202401300303.sql b/resource/sqlupgrade/ST/sql202401300303.sql new file mode 100644 index 000000000..edf082294 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202401300303.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add mobile_feedback_url varchar(500); +/ + From 335964e2df8e6178547f9188fe6a0b7b5fe8ef0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 30 Jan 2024 17:21:13 +0800 Subject: [PATCH 085/169] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../annotation/handle/ElogTableScanner.java | 312 +++++++++--------- 1 file changed, 156 insertions(+), 156 deletions(-) diff --git a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java index a024d3478..709e8e0cb 100644 --- a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java +++ b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java @@ -1,156 +1,156 @@ -package com.engine.salary.elog.annotation.handle; - -import com.engine.salary.elog.annotation.ElogField; -import com.engine.salary.elog.annotation.ElogTable; -import com.engine.salary.elog.entity.dto.DataTypeEnum; -import com.engine.salary.elog.entity.dto.TableColumnBean; -import com.engine.salary.elog.util.ElogUtils; -import lombok.extern.slf4j.Slf4j; -import org.reflections.Reflections; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.lang.reflect.Field; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @ClassName: ElogTableScanner - * @Description 日志操作表扫描 - * @Author tanghj - * @Date 2021/3/12 13:31 - */ -@Slf4j -public class ElogTableScanner { - private Logger logger = LoggerFactory.getLogger(this.getClass()); - -// private TableCheckerMapper tableCheckerMapper; - -// @Override - public void run() throws Exception { - - // todo 需要考虑集群下，控制一台机器来跑 - scanElogTable(); - - } - - private void scanElogTable() { - // todo 是否还需要扫描Elog（因为可能不需要本地存储） ELogDetailTable， -// Map tableBeans = this.applicationContext.getBeansWithAnnotation(ElogTable.class); - Reflections reflections = new Reflections("com.engine.salary.elog"); - Set> tableBeans = reflections.getTypesAnnotatedWith(ElogTable.class); - - - List baseColumns = new ArrayList<>(); - - Map> tableColumns = elogTableHandle(tableBeans,baseColumns); - - for(String tableName : tableColumns.keySet()) { - - // todo 需要处理明细表，如果没有直接初始化原始明细表，如果有加上自定义的 - List columns = tableColumns.get(tableName); - if(columns == null) { - columns = baseColumns; - } else { - columns.addAll(baseColumns); - } - tableCheck(tableName, columns); - } - - } - - private Map> elogTableHandle(Set> tableBeans, List baseColumns) { - Map> tableMap = new HashMap<>(); - for (Class aClass :tableBeans) {//遍历每个controller层 - - List list = new ArrayList<>(); - - ElogTable elogTable = aClass.getAnnotation(ElogTable.class); - - List fields = Arrays.asList(aClass.getDeclaredFields());//获取方法 - for (Field f : fields) { - - ElogField field = f.getAnnotation(ElogField.class); - if(field == null) { - continue; - } - - TableColumnBean tableColumnBean = new TableColumnBean(); - - tableColumnBean.setColumnName(f.getName()); - tableColumnBean.setColumnComment(field.comment()); - tableColumnBean.setColumnDefault(field.defaultValue()); - tableColumnBean.setFieldLength(field.length()); - tableColumnBean.setDataType(field.dataType()); - tableColumnBean.setNullable(field.isNull()); - list.add(tableColumnBean); - } - if(!ElogUtils.BASE_TABLE.equals(elogTable.module())) { - tableMap.put(ElogUtils.getTableName(elogTable.module(), elogTable.function()), list); - } else { - baseColumns.addAll(list); - } - } - - return tableMap; - } - - private void tableCheck(String tableName, List columns) { - List oldColumns = new ArrayList<>(); -// List oldColumns = tableCheckerMapper.getTableStructure(tableName); - - // 表不存在 - if(oldColumns == null || oldColumns.size() == 0) { - createTable(tableName,columns ); - } else { - Map newcolMap = new HashMap<>(); - Map oldcolMap = new HashMap<>(); - - columns.stream().forEach(tableColumnBean -> newcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean)); - oldColumns.stream().forEach(tableColumnBean -> { - tableColumnBean.setDataType(ElogUtils.getEnumFromString(DataTypeEnum.class, tableColumnBean.getDataTypeStr())); - tableColumnBean.setNullable("YES".equalsIgnoreCase(tableColumnBean.getIsNullableStr())); - oldcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean); - }); - // 只增加或者修改，不删除字段 - for(String key : newcolMap.keySet()) { - if(oldcolMap.containsKey(key)) { - // 字段变动则修改 - if(!(newcolMap.get(key).toSql()).equals(oldcolMap.get(key).toSql())) - this.modifyColumn(tableName, newcolMap.get(key)); - } else { - this.addColumn(tableName, newcolMap.get(key)); - } - } - } - - } - - private void createTable(String tableName, List columns) { - StringBuilder sb = new StringBuilder("create table ").append(tableName).append(" ( "); - sb.append(columns.stream().map( bean -> bean.toSql()).collect(Collectors.joining(","))); - sb.append(")"); - logger.info("创建sql:{}",sb.toString()); -// tableCheckerMapper.createElogTable(sb.toString()); - } - - private void addColumn(String tableName, TableColumnBean tableColumnBean) { - StringBuilder sb = new StringBuilder("alter table ") - .append(tableName).append(" ") - .append(" add ") - .append(" column ") - .append(tableColumnBean.toSql()); - logger.info("新增字段sql:{}",sb.toString()); -// tableCheckerMapper.createElogTable(sb.toString()); - } - - private void modifyColumn(String tableName, TableColumnBean tableColumnBean) { - StringBuilder sb = new StringBuilder("alter table ") - .append(tableName).append(" ") - .append(" modify ") - .append(" column ") - .append(tableColumnBean.toSql()); - logger.info("修改字段sql:{}",sb.toString()); -// tableCheckerMapper.createElogTable(sb.toString()); - } -} +//package com.engine.salary.elog.annotation.handle; +// +//import com.engine.salary.elog.annotation.ElogField; +//import com.engine.salary.elog.annotation.ElogTable; +//import com.engine.salary.elog.entity.dto.DataTypeEnum; +//import com.engine.salary.elog.entity.dto.TableColumnBean; +//import com.engine.salary.elog.util.ElogUtils; +//import lombok.extern.slf4j.Slf4j; +//import org.reflections.Reflections; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +// +//import java.lang.reflect.Field; +//import java.util.*; +//import java.util.stream.Collectors; +// +///** +// * @ClassName: ElogTableScanner +// * @Description 日志操作表扫描 +// * @Author tanghj +// * @Date 2021/3/12 13:31 +// */ +//@Slf4j +//public class ElogTableScanner { +// private Logger logger = LoggerFactory.getLogger(this.getClass()); +// +//// private TableCheckerMapper tableCheckerMapper; +// +//// @Override +// public void run() throws Exception { +// +// // todo 需要考虑集群下，控制一台机器来跑 +// scanElogTable(); +// +// } +// +// private void scanElogTable() { +// // todo 是否还需要扫描Elog（因为可能不需要本地存储） ELogDetailTable， +//// Map tableBeans = this.applicationContext.getBeansWithAnnotation(ElogTable.class); +// Reflections reflections = new Reflections("com.engine.salary.elog"); +// Set> tableBeans = reflections.getTypesAnnotatedWith(ElogTable.class); +// +// +// List baseColumns = new ArrayList<>(); +// +// Map> tableColumns = elogTableHandle(tableBeans,baseColumns); +// +// for(String tableName : tableColumns.keySet()) { +// +// // todo 需要处理明细表，如果没有直接初始化原始明细表，如果有加上自定义的 +// List columns = tableColumns.get(tableName); +// if(columns == null) { +// columns = baseColumns; +// } else { +// columns.addAll(baseColumns); +// } +// tableCheck(tableName, columns); +// } +// +// } +// +// private Map> elogTableHandle(Set> tableBeans, List baseColumns) { +// Map> tableMap = new HashMap<>(); +// for (Class aClass :tableBeans) {//遍历每个controller层 +// +// List list = new ArrayList<>(); +// +// ElogTable elogTable = aClass.getAnnotation(ElogTable.class); +// +// List fields = Arrays.asList(aClass.getDeclaredFields());//获取方法 +// for (Field f : fields) { +// +// ElogField field = f.getAnnotation(ElogField.class); +// if(field == null) { +// continue; +// } +// +// TableColumnBean tableColumnBean = new TableColumnBean(); +// +// tableColumnBean.setColumnName(f.getName()); +// tableColumnBean.setColumnComment(field.comment()); +// tableColumnBean.setColumnDefault(field.defaultValue()); +// tableColumnBean.setFieldLength(field.length()); +// tableColumnBean.setDataType(field.dataType()); +// tableColumnBean.setNullable(field.isNull()); +// list.add(tableColumnBean); +// } +// if(!ElogUtils.BASE_TABLE.equals(elogTable.module())) { +// tableMap.put(ElogUtils.getTableName(elogTable.module(), elogTable.function()), list); +// } else { +// baseColumns.addAll(list); +// } +// } +// +// return tableMap; +// } +// +// private void tableCheck(String tableName, List columns) { +// List oldColumns = new ArrayList<>(); +//// List oldColumns = tableCheckerMapper.getTableStructure(tableName); +// +// // 表不存在 +// if(oldColumns == null || oldColumns.size() == 0) { +// createTable(tableName,columns ); +// } else { +// Map newcolMap = new HashMap<>(); +// Map oldcolMap = new HashMap<>(); +// +// columns.stream().forEach(tableColumnBean -> newcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean)); +// oldColumns.stream().forEach(tableColumnBean -> { +// tableColumnBean.setDataType(ElogUtils.getEnumFromString(DataTypeEnum.class, tableColumnBean.getDataTypeStr())); +// tableColumnBean.setNullable("YES".equalsIgnoreCase(tableColumnBean.getIsNullableStr())); +// oldcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean); +// }); +// // 只增加或者修改，不删除字段 +// for(String key : newcolMap.keySet()) { +// if(oldcolMap.containsKey(key)) { +// // 字段变动则修改 +// if(!(newcolMap.get(key).toSql()).equals(oldcolMap.get(key).toSql())) +// this.modifyColumn(tableName, newcolMap.get(key)); +// } else { +// this.addColumn(tableName, newcolMap.get(key)); +// } +// } +// } +// +// } +// +// private void createTable(String tableName, List columns) { +// StringBuilder sb = new StringBuilder("create table ").append(tableName).append(" ( "); +// sb.append(columns.stream().map( bean -> bean.toSql()).collect(Collectors.joining(","))); +// sb.append(")"); +// logger.info("创建sql:{}",sb.toString()); +//// tableCheckerMapper.createElogTable(sb.toString()); +// } +// +// private void addColumn(String tableName, TableColumnBean tableColumnBean) { +// StringBuilder sb = new StringBuilder("alter table ") +// .append(tableName).append(" ") +// .append(" add ") +// .append(" column ") +// .append(tableColumnBean.toSql()); +// logger.info("新增字段sql:{}",sb.toString()); +//// tableCheckerMapper.createElogTable(sb.toString()); +// } +// +// private void modifyColumn(String tableName, TableColumnBean tableColumnBean) { +// StringBuilder sb = new StringBuilder("alter table ") +// .append(tableName).append(" ") +// .append(" modify ") +// .append(" column ") +// .append(tableColumnBean.toSql()); +// logger.info("修改字段sql:{}",sb.toString()); +//// tableCheckerMapper.createElogTable(sb.toString()); +// } +//} From 9074fb46fcd41e55b34e9c65e5779c2f2d6832ee Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 2 Feb 2024 15:23:26 +0800 Subject: [PATCH 086/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8CSIArchivesBiz?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=BF=81=E7=A7=BB=E5=88=B0=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=98=AF=E5=AE=9E=E7=8E=B0=E7=B1=BB=EF=BC=8C=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=B0=83=E7=94=A8=E6=96=B9=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmd/siarchives/SIArchivesTipsCmd.java | 18 +- .../salary/service/SIArchivesService.java | 32 +- .../service/impl/ColumnBuildServiceImpl.java | 19 +- .../service/impl/RecordsBuildServiceImpl.java | 43 +- .../impl/SIAComparisonResultServiceImpl.java | 16 +- .../service/impl/SIAccountServiceImpl.java | 47 +- .../service/impl/SIArchivesServiceImpl.java | 2569 ++++++++++++++++- .../service/impl/SIExportServiceImpl.java | 45 +- .../service/impl/SIImportServiceImpl.java | 16 +- .../service/impl/SISchemeServiceImpl.java | 101 +- .../AutoSyncResignationEmpArchiveJob.java | 11 +- 11 files changed, 2766 insertions(+), 151 deletions(-) diff --git a/src/com/engine/salary/cmd/siarchives/SIArchivesTipsCmd.java b/src/com/engine/salary/cmd/siarchives/SIArchivesTipsCmd.java index 561a395a4..5d4eea819 100644 --- a/src/com/engine/salary/cmd/siarchives/SIArchivesTipsCmd.java +++ b/src/com/engine/salary/cmd/siarchives/SIArchivesTipsCmd.java @@ -3,9 +3,13 @@ package com.engine.salary.cmd.siarchives; import com.engine.common.biz.AbstractCommonCommand; import com.engine.common.entity.BizLogContext; import com.engine.core.interceptor.CommandContext; -import com.engine.salary.biz.SIArchivesBiz; +import com.engine.salary.mapper.siarchives.SocialSchemeMapper; +import com.engine.salary.util.SalaryAssert; +import org.apache.ibatis.session.SqlSession; +import weaver.conn.mybatis.MyBatisFactory; import weaver.hrm.User; +import java.util.List; import java.util.Map; /** @@ -28,8 +32,16 @@ public class SIArchivesTipsCmd extends AbstractCommonCommand @Override public Map execute(CommandContext commandContext) { - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - siArchivesBiz.tips(); + + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + List employeeIds = socialSchemeMapper.tips(); + SalaryAssert.isEmpty(employeeIds, "当前有离职人员档案存在福利缴纳起始月,未维护福利最后缴纳月，请尽快处理"); + + } finally { + sqlSession.close(); + } return null; } } diff --git a/src/com/engine/salary/service/SIArchivesService.java b/src/com/engine/salary/service/SIArchivesService.java index 7f2f31866..4f98cc742 100644 --- a/src/com/engine/salary/service/SIArchivesService.java +++ b/src/com/engine/salary/service/SIArchivesService.java @@ -1,11 +1,11 @@ package com.engine.salary.service; +import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseHistoryDTO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.InsuranceArchivesSaveParam; import com.engine.salary.entity.siarchives.param.SIArchiveBaseHistoryListParam; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesEmployeePO; +import com.engine.salary.entity.siarchives.po.*; import com.engine.salary.util.page.PageInfo; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -124,4 +124,32 @@ public interface SIArchivesService { PageInfo getAdjustHistoryList(SIArchiveBaseHistoryListParam param); PageInfo historyListByEmployeeIdAndOperator(SIArchiveBaseHistoryListParam param); + + List> buildTableData(List insuranceArchivesEmployeePOS); + + List buildWeaTableColumns(List insuranceArchivesEmployeePOS); + + boolean isDiffWelBase(); + + List payInsuranceIds(Long socialSchemeId, Integer paymentScope); + + List payInsuranceIds(Long socialSchemeId); + + List getSocialByEmployeeIds(List employeeIds); + List getFundByEmployeeIds(List employeeIds); + List getOtherByEmployeeIds(List employeeIds); + + Map buildBatchAccount(List ids, Long paymentOrganization); + + Boolean checkWelBaseLimit(Long primaryId, String paymentBaseString, Integer paymentScope); + + String checkAndBuildWelBaseWithLimit(Long primaryId, String paymentBaseString, Integer paymentScope); + + List dealSocialBaseAdjustInfoList(List adjustList, Long creator); + List dealFundBaseAdjustInfoList(List adjustList, Long creator); + List dealOtherBaseAdjustInfoList(List adjustList, Long creator); + + void batchInsertAdjustHistory(List adjustHistoryList); + + List listEndDateIsNull(List employeeIds); } diff --git a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java index 5312f1c51..a03f1e529 100644 --- a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.cloudstore.eccom.constant.WeaBoolAttr; import com.cloudstore.eccom.pc.table.WeaTableColumn; +import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; import com.engine.salary.entity.siaccount.po.InsuranceAccountInspectPO; import com.engine.salary.entity.siarchives.po.InsuranceArchivesAccountPO; @@ -17,9 +17,11 @@ import com.engine.salary.enums.siaccount.PaymentStatusEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.service.ColumnBuildService; +import com.engine.salary.service.SIArchivesService; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import org.apache.commons.lang3.StringUtils; +import weaver.hrm.User; import java.util.*; import java.util.stream.Collectors; @@ -32,11 +34,16 @@ import java.util.stream.Collectors; **/ public class ColumnBuildServiceImpl extends Service implements ColumnBuildService { - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); private ICategoryMapper getICategoryMapper() { return MapperProxyFactory.getProxy(ICategoryMapper.class); } + + public SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class, user); + } + @Override public List buildCommonColumnsWithStyle(List pos, Long employeeId, String tenantKey, Integer paymentStatus) { List list = new ArrayList<>(); @@ -125,7 +132,8 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic } private Map> buildPaymentTitle(List pos, Map categoryIdNameMap, Long employeeId, String tenantKey) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); Set socailIds = new HashSet<>(); Set fundIds = new HashSet<>(); Set otherIds = new HashSet<>(); @@ -440,9 +448,10 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic @Override public List buildInspectColumns(List pos, Long paymentOrganization) { List list = new ArrayList<>(); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + List employeeIds = pos.stream().map(InsuranceAccountInspectPO::getEmployeeId).collect(Collectors.toList()); - Map insuranceArchivesAccountPOMap = siArchivesBiz.buildBatchAccount(employeeIds, paymentOrganization); +// Map insuranceArchivesAccountPOMap = siArchivesBiz.buildBatchAccount(employeeIds, paymentOrganization); + Map insuranceArchivesAccountPOMap = getSIArchivesService(user).buildBatchAccount(employeeIds, paymentOrganization); Map categoryIdNameMap = getICategoryMapper().listAll().stream().collect(Collectors.toMap(ICategoryPO -> String.valueOf(ICategoryPO.getId()), ICategoryPO::getInsuranceName)); Map> columns = buildInspectTableTitle(new ArrayList<>(insuranceArchivesAccountPOMap.values()), categoryIdNameMap); WeaTableColumn weaTableNameColumn = new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 85429, "姓名"), "userName"); diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index a18ca32e0..2976579d4 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; import com.engine.salary.entity.siaccount.po.InsuranceAccountInspectPO; @@ -21,6 +20,7 @@ import com.engine.salary.mapper.datacollection.EmployMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.RecordsBuildService; +import com.engine.salary.service.SIArchivesService; import com.engine.salary.service.SalaryEmployeeService; import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryDateUtil; @@ -62,11 +62,16 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); } - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + + public SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class, user); + } @Override public List> buildCommonRecords(List list, Long employeeId) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); List> result = new ArrayList<>(); if (CollectionUtils.isEmpty(list)) { return result; @@ -114,7 +119,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ if (welBaseDiffSign) { if (socialJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); socialJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "socialPerBase", v); @@ -125,7 +131,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ }); if (socialComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); socialComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "socialComBase", v); @@ -135,7 +142,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ } else { if (socialJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getSocialSchemeId()); socialJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "socialBase", v); @@ -158,7 +166,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ if (welBaseDiffSign) { if (fundJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); fundJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "fundPerBase", v); @@ -169,7 +178,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ }); if (fundComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); fundComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "fundComBase", v); @@ -179,7 +189,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ } else { if (fundJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getFundSchemeId()); fundJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "fundBase", v); @@ -200,7 +211,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ if (welBaseDiffSign) { if (otherJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); otherJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "otherPerBase", v); @@ -211,7 +223,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ }); if (otherComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); otherComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "otherComBase", v); @@ -221,7 +234,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ } else { if (otherJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getOtherSchemeId()); otherJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "otherBase", v); @@ -311,7 +325,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ @Override public List> buildInspectRecords(List list, Long paymentOrganization) { List> result = new ArrayList<>(); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + if (CollectionUtils.isEmpty(list)) { return result; } @@ -325,7 +339,8 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ return result; } Map collect = employeeByIds.stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, Function.identity())); - Map insuranceArchivesAccountPOMap = siArchivesBiz.buildBatchAccount(employeeIds, paymentOrganization); +// Map insuranceArchivesAccountPOMap = siArchivesBiz.buildBatchAccount(employeeIds, paymentOrganization); + Map insuranceArchivesAccountPOMap = getSIArchivesService(user).buildBatchAccount(employeeIds, paymentOrganization); list.forEach(item -> { Map record = new HashMap<>(); DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId()) == null ? new DataCollectionEmployee() : collect.get(item.getEmployeeId()); diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java index 389e4ef2b..05512c23c 100644 --- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java @@ -2,7 +2,6 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.bo.InsuranceComparisonResultBO; import com.engine.salary.entity.siaccount.dto.InsuranceComparisonResultListDTO; @@ -19,19 +18,18 @@ import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; import com.engine.salary.service.SIAComparisonResultService; +import com.engine.salary.service.SIArchivesService; import com.engine.salary.service.SISchemeService; import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.db.MapperProxyFactory; -import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.Column; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; -import com.wbi.util.Util; import org.apache.commons.lang3.BooleanUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.hrm.User; @@ -47,7 +45,7 @@ import java.util.stream.Collectors; public class SIAComparisonResultServiceImpl extends Service implements SIAComparisonResultService { private EncryptUtil encryptUtil = new EncryptUtil(); - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); private InsuranceExportMapper getInsuranceExportMapper() { return MapperProxyFactory.getProxy(InsuranceExportMapper.class); @@ -73,6 +71,10 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar return ServiceUtil.getService(SISchemeServiceImpl.class, user); } + public SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class, user); + } + /** * 根据列表查询条件查询线下对比结果（分页） */ @@ -144,7 +146,8 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar */ private InsuranceComparisonResultListDTO listByParam(boolean needPage, InsuranceComparisonResultQueryParam queryParam) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); //排序配置 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); @@ -232,7 +235,8 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar } private Set welfareInfo() { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); Set info = new HashSet<>(); List listAll = getICategoryMapper().listAll(); diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 857196426..08b7fc624 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -103,7 +103,7 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; public class SIAccountServiceImpl extends Service implements SIAccountService { - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); private EncryptUtil encryptUtil = new EncryptUtil(); @@ -227,6 +227,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return MapperProxyFactory.getProxy(SIAccountUtilMapper.class); } + public SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class, user); + } + @Override public Map listPage(InsuranceAccountBatchParam queryParam) { Long employeeId = (long) user.getUID(); @@ -761,13 +765,15 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), insuranceArchivesEmployeePOS, InsuranceArchivesEmployeePO.class); - List> records = siArchivesBiz.buildTableData(insuranceArchivesEmployeePOS); +// List> records = siArchivesBiz.buildTableData(insuranceArchivesEmployeePOS); + List> records = getSIArchivesService(user).buildTableData(insuranceArchivesEmployeePOS); PageInfo> pageInfos = new PageInfo<>(records); pageInfos.setTotal(pageInfo.getTotal()); pageInfos.setPageNum(param.getCurrent()); pageInfos.setPageSize(param.getPageSize()); - List weaTableColumns = siArchivesBiz.buildWeaTableColumns(insuranceArchivesEmployeePOS, employeeId); +// List weaTableColumns = siArchivesBiz.buildWeaTableColumns(insuranceArchivesEmployeePOS, employeeId); + List weaTableColumns = getSIArchivesService(user).buildWeaTableColumns(insuranceArchivesEmployeePOS); WeaTable table = new WeaTable(); table.setPageUID(UUID.randomUUID().toString()); @@ -2349,7 +2355,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } public Map> createWelColumnMap(InsuranceAccountDetailParam param) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); //查询线上福利核算记录 InsuranceExportParam insuranceExportParam = new InsuranceExportParam(); insuranceExportParam.setBillMonth(param.getBillMonth()); @@ -2496,7 +2503,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } public Map welColumnNameCodeMap(InsuranceAccountDetailParam param) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); //查询线上福利核算记录 InsuranceExportParam insuranceExportParam = new InsuranceExportParam(); insuranceExportParam.setBillMonth(param.getBillMonth()); @@ -2821,7 +2829,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { * @param baseMap excel导入的对比数据 */ private ExcelInsuranceDetailPO handleExcelInsuranceDetail(String billMonth, Long employeeId, Long paymentOrganization, Map baseMap, Map welColumnNameCodeMap) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); ExcelInsuranceDetailPO excelInsuranceDetailPO = new ExcelInsuranceDetailPO(); excelInsuranceDetailPO.setId(IdGenerator.generate()); @@ -4452,7 +4461,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List empIdsInPayMonthRange = listCanPayEmpIds(param.getPaymentOrganization(), param.getBillMonth()); empIds = empIds.stream().filter(f->canAccountIds.contains(f) && empIdsInPayMonthRange.contains(f)).collect(Collectors.toList()); - List socials = siArchivesBiz.getSocialByEmployeeIds(empIds); +// List socials = siArchivesBiz.getSocialByEmployeeIds(empIds); + List socials = getSIArchivesService(user).getSocialByEmployeeIds(empIds); //过滤出目标个税扣缴义务人相关信息 socials = socials.stream().filter(f -> f.getPaymentOrganization().equals(param.getPaymentOrganization())).collect(Collectors.toList()); List emp1 = socials.stream() @@ -4461,7 +4471,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { .map(InsuranceArchivesSocialSchemePO::getEmployeeId) .collect(Collectors.toList()); - List funds = siArchivesBiz.getFundByEmployeeIds(empIds); +// List funds = siArchivesBiz.getFundByEmployeeIds(empIds); + List funds = getSIArchivesService(user).getFundByEmployeeIds(empIds); //过滤出目标个税扣缴义务人相关信息 funds = funds.stream().filter(f -> f.getPaymentOrganization().equals(param.getPaymentOrganization())).collect(Collectors.toList()); List emp2 = funds.stream() @@ -4470,7 +4481,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { .map(InsuranceArchivesFundSchemePO::getEmployeeId) .collect(Collectors.toList()); - List others = siArchivesBiz.getOtherByEmployeeIds(empIds); +// List others = siArchivesBiz.getOtherByEmployeeIds(empIds); + List others = getSIArchivesService(user).getOtherByEmployeeIds(empIds); //过滤出目标个税扣缴义务人相关信息 others = others.stream().filter(f -> f.getPaymentOrganization().equals(param.getPaymentOrganization())).collect(Collectors.toList()); List emp3 = others.stream() @@ -4534,8 +4546,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } public void siCommonAccount(String billMonth, List ids, Long paymentOrganization) { - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - Map insuranceArchivesAccountPOS = siArchivesBiz.buildBatchAccount(ids, paymentOrganization); + +// Map insuranceArchivesAccountPOS = siArchivesBiz.buildBatchAccount(ids, paymentOrganization); + Map insuranceArchivesAccountPOS = getSIArchivesService(user).buildBatchAccount(ids, paymentOrganization); List list = new ArrayList<>(); int count = 0; for (Map.Entry entry : insuranceArchivesAccountPOS.entrySet()) { @@ -4597,7 +4610,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } public InsuranceAccountDetailPO accountOther(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); if (accountPO.getOther() != null) { InsuranceArchivesOtherSchemePO otherPO = accountPO.getOther(); insuranceAccountDetailPO.setOtherPayOrg(otherPO.getPaymentOrganization()); @@ -4759,7 +4773,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { public InsuranceAccountDetailPO accountFund(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); if (accountPO.getFund() != null) { InsuranceArchivesFundSchemePO fundPO = accountPO.getFund(); insuranceAccountDetailPO.setFundPayOrg(fundPO.getPaymentOrganization()); @@ -4922,7 +4937,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { public InsuranceAccountDetailPO accountSocial(InsuranceAccountDetailPO insuranceAccountDetailPO, InsuranceArchivesAccountPO accountPO, String billMonth) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); if (accountPO.getSocial() != null) { InsuranceArchivesSocialSchemePO socialPO = accountPO.getSocial(); insuranceAccountDetailPO.setSocialPayOrg(socialPO.getPaymentOrganization()); @@ -5498,7 +5514,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { */ public String accountSupplement(List baseList, List employeeIds, Long paymentOrganization) { //(k,v) k-员工id v-员工对应的福利档案数据 - Map longInsuranceArchivesAccountPOMap = siArchivesBiz.buildBatchAccount(employeeIds, paymentOrganization); +// Map longInsuranceArchivesAccountPOMap = siArchivesBiz.buildBatchAccount(employeeIds, paymentOrganization); + Map longInsuranceArchivesAccountPOMap = getSIArchivesService(user).buildBatchAccount(employeeIds, paymentOrganization); //核算结果集 List pos = new ArrayList<>(); baseList.forEach(baseParam -> { diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 641118a29..29859d236 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -1,63 +1,94 @@ package com.engine.salary.service.impl; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.api.browser.bean.SearchConditionGroup; +import com.api.browser.bean.SearchConditionItem; +import com.api.browser.bean.SearchConditionOption; +import com.api.browser.util.ConditionFactory; +import com.api.browser.util.ConditionType; import com.cloudstore.dev.api.util.Util_DataCache; +import com.cloudstore.eccom.pc.table.WeaTable; +import com.cloudstore.eccom.pc.table.WeaTableCheckboxpopedom; import com.cloudstore.eccom.pc.table.WeaTableColumn; +import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIArchivesBiz; +import com.engine.salary.biz.SICategoryBiz; +import com.engine.salary.biz.SISchemeBiz; import com.engine.salary.cmd.siarchives.SIArchivesTipsCmd; +import com.engine.salary.common.SalaryContext; +import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.EncryptUtil; +import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBO; import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBaseInfoBO; -import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseHistoryDTO; -import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; -import com.engine.salary.entity.siarchives.param.InsuranceArchivesSaveParam; -import com.engine.salary.entity.siarchives.param.SIArchiveBaseHistoryListParam; +import com.engine.salary.entity.siarchives.dto.*; +import com.engine.salary.entity.siarchives.param.*; import com.engine.salary.entity.siarchives.po.*; +import com.engine.salary.entity.sicategory.po.ICategoryPO; +import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; +import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentEmpChangePO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.UserStatusEnum; +import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; -import com.engine.salary.enums.sicategory.DeleteTypeEnum; -import com.engine.salary.enums.sicategory.NonPaymentEnum; -import com.engine.salary.enums.sicategory.PaymentScopeEnum; -import com.engine.salary.enums.sicategory.WelfareTypeEnum; +import com.engine.salary.enums.sicategory.*; import com.engine.salary.enums.taxagent.TaxAgentEmpChangeModuleEnum; import com.engine.salary.exception.SalaryRunTimeException; -import com.engine.salary.mapper.siarchives.FundSchemeMapper; -import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; -import com.engine.salary.mapper.siarchives.OtherSchemeMapper; -import com.engine.salary.mapper.siarchives.SocialSchemeMapper; +import com.engine.salary.mapper.siarchives.*; +import com.engine.salary.mapper.sicategory.ICategoryMapper; +import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; +import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.SIArchivesService; +import com.engine.salary.service.SalaryEmployeeService; import com.engine.salary.service.TaxAgentEmpChangeService; import com.engine.salary.service.TaxAgentService; import com.engine.salary.sys.constant.SalarySysConstant; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; +import com.engine.salary.sys.enums.OpenEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; -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.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; +import com.engine.salary.wrapper.TaxAgentWrapper; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.session.SqlSession; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StopWatch; +import weaver.conn.mybatis.MyBatisFactory; import weaver.general.BaseBean; import weaver.general.Util; import weaver.hrm.User; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; +import static com.engine.salary.sys.constant.SalarySysConstant.WEL_BASE_AUTO_ADJUST; +import static com.engine.salary.sys.constant.SalarySysConstant.WEL_BASE_DIFF_BY_PER_AND_COM; + /** * @Author weaver_cl * @Description: @@ -70,7 +101,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService private final Boolean isLog = "true".equals(baseBean.getPropValue("hrmSalary", "log")); - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); private EncryptUtil encryptUtil = new EncryptUtil(); @@ -102,6 +133,22 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return MapperProxyFactory.getProxy(OtherSchemeMapper.class); } + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + + private InsuranceSchemeDetailMapper getInsuranceSchemeDetailMapper() { + return MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class); + } + + private SalaryEmployeeService getSalaryEmployeeService(User user) { + return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); + } + + private TaxAgentWrapper getTaxAgentWrapper(User user) { + return ServiceUtil.getService(TaxAgentWrapper.class, user); + } + @Override public Map getTips(Map params) { return commandExecutor.execute(new SIArchivesTipsCmd(params, user)); @@ -114,20 +161,20 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService Collection taxAgentPOS = getTaxAgentService(user).listAllTaxAgentsAsAdmin(currentEmployeeId); Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - siArchivesBiz.setNeedAuth(needAuth); - siArchivesBiz.setTaxAgentPOS(taxAgentPOS); +// SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +//// siArchivesBiz.setNeedAuth(needAuth); +//// siArchivesBiz.setTaxAgentPOS(taxAgentPOS); WelfareTypeEnum welfareTypeEnum = (WelfareTypeEnum) params.get("welfareTypeEnum"); Long employeeId = Long.valueOf(Util.null2String(params.get("employeeId"))); Long paymentOrganization = welfareTypeEnum != null ? Long.valueOf(Util.null2String(params.get("paymentOrganization"))) : null; - apidatas = siArchivesBiz.getBaseForm(welfareTypeEnum, employeeId, (long) user.getUID(), user, paymentOrganization); +// apidatas = siArchivesBiz.getBaseForm(welfareTypeEnum, employeeId, (long) user.getUID(), user, paymentOrganization); + apidatas = getBaseForm(welfareTypeEnum, employeeId, paymentOrganization, taxAgentPOS); return apidatas; } @Override public Map getPaymentForm(Map params) { Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); WelfareTypeEnum welfareTypeEnum = (WelfareTypeEnum) params.get("welfareTypeEnum"); Long employeeId = Long.valueOf(Util.null2String(params.get("employeeId"))); String schemeIdStr = Util.null2String(params.get("schemeId")); @@ -136,16 +183,31 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (StringUtils.isNotBlank(schemeIdStr)) { schemeId = Long.valueOf(schemeIdStr); } - - apidatas = siArchivesBiz.getPaymentForm(user, welfareTypeEnum, employeeId, (long) user.getUID(), schemeId, paymentOrganization); +// apidatas = siArchivesBiz.getPaymentForm(user, welfareTypeEnum, employeeId, (long) user.getUID(), schemeId, paymentOrganization); + apidatas = getPaymentForm(user, welfareTypeEnum, employeeId, schemeId, paymentOrganization); return apidatas; } @Override public String insert(InsuranceArchivesSaveParam param) { - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - siArchivesBiz.insert(param, user); + SalaryAssert.notNull(param.getWelfareType(), "福利类型为空"); + //判断是否要区分个人和单位福利基数 + SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); + boolean welBaseDiffSign = welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); + switch (param.getWelfareType()) { + case SOCIAL_SECURITY: + socialSave(param, user, welBaseDiffSign); + break; + case ACCUMULATION_FUND: + fundSave(param, user, welBaseDiffSign); + break; + case OTHER: + otherSave(param, user, welBaseDiffSign); + break; + default: + throw new SalaryRunTimeException("福利类型不存在"); + } return null; } @@ -187,8 +249,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - apidatas = siArchivesBiz.listPage(param, (long) user.getUID()); +// apidatas = siArchivesBiz.listPage(param, (long) user.getUID()); + apidatas = listPage(param, (long) user.getUID()); log.info("各操作计时 {}", sw.prettyPrint()); return apidatas; @@ -200,8 +262,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService */ private void handleHistoryData(long currentEmployeeId) { //如果触发历史数据处理，则进行一次全量增员 - if (siArchivesBiz.createOldInsuranceBaseInfo(currentEmployeeId)) { - + if (createOldInsuranceBaseInfo(currentEmployeeId)) { //批量增员 List allBaseInfoList = getInsuranceBaseInfoMapper().listAll(); Collection stayAddIds = allBaseInfoList.stream().filter(f->f.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())) @@ -576,8 +637,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public Map getSearchCondition(Map param) { Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - apidatas = siArchivesBiz.getSearchCondition(user); +// apidatas = siArchivesBiz.getSearchCondition(user); + apidatas = getSearchCondition(); return apidatas; } @@ -607,8 +668,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (insuranceArchivesEmployeePOS == null) { insuranceArchivesEmployeePOS = new ArrayList<>(); } - List> records = siArchivesBiz.buildTableData(insuranceArchivesEmployeePOS); - List columns = siArchivesBiz.buildWeaTableColumns(insuranceArchivesEmployeePOS, user.getUID()); +// List> records = siArchivesBiz.buildTableData(insuranceArchivesEmployeePOS); + List> records = buildTableData(insuranceArchivesEmployeePOS); +// List columns = siArchivesBiz.buildWeaTableColumns(insuranceArchivesEmployeePOS, user.getUID()); + List columns = buildWeaTableColumns(insuranceArchivesEmployeePOS); //工作簿list List> excelSheetData = new ArrayList<>(); @@ -1185,7 +1248,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (param.getWelfareTypeEnum() == null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "参数错误")); } - List adjustHistoryDTOS = siArchivesBiz.getAdjustHistoryList(param.getPaymentOrganization(), param.getEmployeeId()); +// List adjustHistoryDTOS = siArchivesBiz.getAdjustHistoryList(param.getPaymentOrganization(), param.getEmployeeId()); + List adjustHistoryDTOS = getAdjustHistoryList(param.getPaymentOrganization(), param.getEmployeeId()); List targetHistory = adjustHistoryDTOS.stream() .filter(f -> f.getWelfareType().equals(param.getWelfareTypeEnum().getValue())).collect(Collectors.toList()); @@ -1199,7 +1263,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public PageInfo historyListByEmployeeIdAndOperator(SIArchiveBaseHistoryListParam param) { - List adjustHistoryDTOS = siArchivesBiz.getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); +// List adjustHistoryDTOS = siArchivesBiz.getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); + List adjustHistoryDTOS = getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); // 分权逻辑 Boolean needAuth = getTaxAgentService(user).isNeedAuth((long) user.getUID()); @@ -1303,9 +1368,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .adjustBeforeComBaseJson(toUpdateOtherInfo.getOtherPaymentComBaseString()) .build(); List adjustHistoryList = new ArrayList<>(); - adjustHistoryList.addAll(siArchivesBiz.createAdjustInfo(socialAdjustInfo, (long) user.getUID())); - adjustHistoryList.addAll(siArchivesBiz.createAdjustInfo(fundAdjustInfo, (long) user.getUID())); - adjustHistoryList.addAll(siArchivesBiz.createAdjustInfo(otherAdjustInfo, (long) user.getUID())); + adjustHistoryList.addAll(createAdjustInfo(socialAdjustInfo, (long) user.getUID())); + adjustHistoryList.addAll(createAdjustInfo(fundAdjustInfo, (long) user.getUID())); + adjustHistoryList.addAll(createAdjustInfo(otherAdjustInfo, (long) user.getUID())); //更新字段 toUpdateBaseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); @@ -1345,7 +1410,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService getFundSchemeMapper().updateById(toUpdateFundInfo); getOtherSchemeMapper().updateById(toUpdateOtherInfo); //基数调整记录入库 - siArchivesBiz.batchInsertAdjustHistory(adjustHistoryList, (long) user.getUID()); +// siArchivesBiz.batchInsertAdjustHistory(adjustHistoryList, (long) user.getUID()); + batchInsertAdjustHistory(adjustHistoryList); Map resultMap = new HashMap<>(2); String resultMsg = "操作成功"; @@ -1355,4 +1421,2429 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService resultMap.put("msg", resultMsg); return resultMap; } + + /*****以下代码为SIArchivesBiz中逻辑迁移，旨在减少Biz类的使用*****/ + /** + * 判断是否需要生成历史福利档案基本信息 + */ + public Boolean createOldInsuranceBaseInfo(Long creator) { + + + log.info("判断是否需要生成历史数据"); + List nowBaseInfoList = getInsuranceBaseInfoMapper().getInsuranceBaseInfoList(); + if (nowBaseInfoList.size() == 0) { + StopWatch sw = new StopWatch(); + log.info("福利档案基础信息表为空，开始生成历史数据："); + //处理公积金、其他福利档案中个税扣缴义务人为空的情况 + sw.start("处理公积金、其他福利档案中个税扣缴义务人为空的情况"); + List socialList = getSocialSchemeMapper().listAll(); + List fundList = getFundSchemeMapper().listAll(); + List otherList = getOtherSchemeMapper().listAll(); + + List updateFundList = new ArrayList<>(); + List updateOtherList = new ArrayList<>(); + for (InsuranceArchivesSocialSchemePO socialSchemePO : socialList) { + List toDealFundList = fundList.stream().filter(f -> f.getEmployeeId().equals(socialSchemePO.getEmployeeId()) && f.getPaymentOrganization() == null).collect(Collectors.toList()); + if (toDealFundList.size() > 0) { + InsuranceArchivesFundSchemePO toDealFundPO = toDealFundList.get(0); + toDealFundPO.setPaymentOrganization(socialSchemePO.getPaymentOrganization()); + updateFundList.add(toDealFundPO); + } + + List toDealOtherList = otherList.stream().filter(f -> f.getEmployeeId().equals(socialSchemePO.getEmployeeId()) && f.getPaymentOrganization() == null).collect(Collectors.toList()); + if (toDealOtherList.size() > 0) { + InsuranceArchivesOtherSchemePO toDealOtherPO = toDealOtherList.get(0); + toDealOtherPO.setPaymentOrganization(socialSchemePO.getPaymentOrganization()); + updateOtherList.add(toDealOtherPO); + + } + + } + log.info("重置个税扣缴义务人id的公积金档案数：{}", updateFundList.size()); + log.info("重置个税扣缴义务人id的其他福利档案数：{}", updateOtherList.size()); + //更新公积金和其他福利档案 + updateFundList.forEach(getFundSchemeMapper()::updateById); + updateOtherList.forEach(getOtherSchemeMapper()::updateById); + sw.stop(); + + sw.start("处理待入库的历史福利档案基础信息并入库"); + List addBaseInfoList = new ArrayList<>(); + + List oldBaseInfoList = getInsuranceBaseInfoMapper().getInsuranceBaseInfoListByInsuranceDetail(null); + log.info("获取待生成的历史福利档案基础信息条数：{}", oldBaseInfoList.size()); + //去重 + oldBaseInfoList = oldBaseInfoList.stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); + log.info("去重后的待生成历史福利档案基础信息条数：{}", oldBaseInfoList.size()); + if (oldBaseInfoList.size() > 0) { + //设置基本信息表字段 + for (InsuranceArchivesBaseInfoPO po : oldBaseInfoList) { + po.setId(IdGenerator.generate()); + po.setCreateTime(new Date()); + po.setDeleteType(0); + po.setCreator(creator); + po.setRunStatus(EmployeeStatusEnum.STAY_ADD.getValue()); + po.setUpdateTime(new Date()); + po.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + + addBaseInfoList.add(po); + } + //将历史基本信息入库 + List> partition = Lists.partition(addBaseInfoList, 50); + partition.forEach(getInsuranceBaseInfoMapper()::batchSave); + + sw.stop(); + log.info("各操作计时 {}", sw.prettyPrint()); + return true; + }else { + return false; + } + + + } else { + return false; + } + + } + @Override + public List> buildTableData(List insuranceArchivesEmployeePOS) { + return buildTableData(insuranceArchivesEmployeePOS, false); + } + + /** + * @param insuranceArchivesEmployeePOS + * @return + */ + public List> buildTableData(List insuranceArchivesEmployeePOS, boolean export) { + + boolean welBaseDiffSign = isDiffWelBase(); + + List taxAgentPOS = getTaxAgentMapper().listAll(); + Map longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId); + + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + List> records = new ArrayList<>(); + try { + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + + Map socialSchemePOMap = encryptUtil.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesSocialSchemePO.class) + .stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getId, Function.identity())); + + Map fundSchemePOMap = encryptUtil.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesFundSchemePO.class) + .stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getId, Function.identity())); + List otherByEmployeeList = this.getOtherByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS); + encryptUtil.decryptList(otherByEmployeeList, InsuranceArchivesOtherSchemePO.class); + Map otherSchemePOMap = otherByEmployeeList + .stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getId, Function.identity())); + insuranceArchivesEmployeePOS.forEach(item -> { + InsuranceArchivesSocialSchemePO socialItem = socialSchemePOMap.get(item.getSocialId()); + InsuranceArchivesFundSchemePO fundItem = fundSchemePOMap.get(item.getFundId()); + InsuranceArchivesOtherSchemePO otherItem = otherSchemePOMap.get(item.getOtherId()); + Map map = new HashMap<>(); + map.put("employeeName", item.getUserName()); + map.put("paymentOrganizationName", longTaxAgentPOMap.get(item.getPaymentOrganization()) != null ? longTaxAgentPOMap.get(item.getPaymentOrganization()).getName() : ""); + map.put("employeeId", item.getEmployeeId()); + map.put("departmentName", item.getDepartmentName()); + map.put("subcompanyName", item.getSubcompanyName()); + map.put("departmentId", item.getDepartmentId()); + map.put("jobNum", item.getJobNum()); + map.put("companystartdate", item.getCompanystartdate()); + map.put("dismissdate", item.getDimissionDate()); + map.put("mobile", item.getTelephone()); + map.put("siSchemeId", item.getSiSchemeId()); + map.put("fundSchemeId", item.getFundSchemeId()); + map.put("otherSchemeId", item.getOtherSchemeId()); + map.put("status", item.getUserStatus() != null ? UserStatusEnum.getDefaultLabelByValue(item.getUserStatus()) : ""); + map.put("baseInfo", item.getBaseInfoId()); + map.put("paymentOrganization", item.getPaymentOrganization()); + if (socialItem != null) { + map.put("socialName", insuranceSchemeMapper.querySchemeName(socialItem.getSocialSchemeId())); + Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { + }); + if (welBaseDiffSign) { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map socialComJson = JSON.parseObject(socialItem.getSocialPaymentComBaseString(), new TypeReference>() { + }); + if (socialComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + socialComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } + } + + map.put("socialAccount", socialItem.getSocialAccount()); + map.put("socialStartTime", socialItem.getSocialStartTime()); + map.put("socialEndTime", socialItem.getSocialEndTime()); + } + if (fundItem != null) { + map.put("fundName", insuranceSchemeMapper.querySchemeName(fundItem.getFundSchemeId())); + map.put("fundAccount", fundItem.getFundAccount()); + Map fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference>() { + }); + if (welBaseDiffSign) { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map fundComJson = JSON.parseObject(fundItem.getFundPaymentComBaseString(), new TypeReference>() { + }); + if (fundComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } + } + + map.put("supplementFundAccount", fundItem.getSupplementFundAccount()); + map.put("fundStartTime", fundItem.getFundStartTime()); + map.put("fundEndTime", fundItem.getFundEndTime()); + + } + if (otherItem != null) { + map.put("otherName", insuranceSchemeMapper.querySchemeName(otherItem.getOtherSchemeId())); + Map otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference>() { + }); + if (welBaseDiffSign) { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map otherComJson = JSON.parseObject(otherItem.getOtherPaymentComBaseString(), new TypeReference>() { + }); + if (otherComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } + } + + map.put("otherStartTime", otherItem.getOtherStartTime()); + map.put("otherEndTime", otherItem.getOtherEndTime()); + } + records.add(map); + }); + return records; + + } finally { + sqlSession.close(); + } + } + + @Override + public boolean isDiffWelBase() { + User user = (User) SalaryContext.get().getValue("user"); + //判断是否要区分个人和单位福利基数 + SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); + + return welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); + } + + /** + * 根据人员id和个税扣缴人id获取记录 + */ + public List getSocialByEmployeeIdAndPayOrg(List insuranceArchivesEmployeePOS) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + List allList = new ArrayList<>(); + for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { + List socialList = socialSchemeMapper.getSocialByEmployeeIdAndPayOrg(po); + if (socialList.size() > 0) { + allList.add(socialList.get(0)); + } + } + return allList; + } finally { + sqlSession.close(); + } + } + + public List getFundByEmployeeIdAndPayOrg(List insuranceArchivesEmployeePOS) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); + List allList = new ArrayList<>(); + for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { + List fundList = fundSchemeMapper.getFundByEmployeeIdAndPayOrg(po); + if (fundList.size() > 0) { + allList.add(fundList.get(0)); + } + } + return allList; + } finally { + sqlSession.close(); + } + } + + public List getOtherByEmployeeIdAndPayOrg(List insuranceArchivesEmployeePOS) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); + List allList = new ArrayList<>(); + for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { + List otherList = otherSchemeMapper.getOtherByEmployeeIdAndPayOrg(po); + if (otherList.size() > 0) { + allList.add(otherList.get(0)); + } + } + return allList; + } finally { + sqlSession.close(); + } + } + + @Override + public List payInsuranceIds(Long socialSchemeId, Integer paymentScope) { + //查询该福利方案下开启缴纳的福利项 + List detailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(socialSchemeId); + List insuranceIdList = new ArrayList<>(); + if (detailPOS != null && detailPOS.size() > 0) { + //开启缴纳的 + insuranceIdList = detailPOS.stream().filter(f -> f.getIsPayment().equals(IsPaymentEnum.YES.getValue()) && f.getPaymentScope().equals(paymentScope)) + .map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); + } + return insuranceIdList; + } + + @Override + public List payInsuranceIds(Long socialSchemeId) { + //查询该福利方案下开启缴纳的福利项 + List detailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(socialSchemeId); + List insuranceIdList = new ArrayList<>(); + if (detailPOS != null && detailPOS.size() > 0) { + //开启缴纳的 + insuranceIdList = detailPOS.stream().filter(f -> f.getIsPayment().equals(IsPaymentEnum.YES.getValue())).map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); + } + return insuranceIdList; + } + + @Override + public List buildWeaTableColumns(List insuranceArchivesEmployeePOS) { + + Map> titleMap = buildColumnTitle(insuranceArchivesEmployeePOS); + List list = new ArrayList<>(); + WeaTableColumn nameColumn = new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "姓名"), "employeeName"); + nameColumn.setFixed("left"); + list.add(nameColumn); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "个税扣缴义务人"), "paymentOrganizationName")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "分部"), "subcompanyName")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "部门"), "departmentName")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "手机号"), "mobile")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "员工状态"), "status")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "工号"), "jobNum")); + + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "入职日期"), "companystartdate")); +// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "合同到期日期"), "dismissdate")); + + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "社保方案名称"), "socialName")); + titleMap.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k))); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "社保账号"), "socialAccount")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "社保起始缴纳月"), "socialStartTime")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "社保最后缴纳月"), "socialEndTime")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "公积金方案名称"), "fundName")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "公积金账号"), "fundAccount")); + titleMap.get(WelfareTypeEnum.ACCUMULATION_FUND.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k))); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "补充公积金账号"), "supplementFundAccount")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "公积金起始缴纳月"), "fundStartTime")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "公积金最后缴纳月"), "fundEndTime")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "其他福利方案名称"), "otherName")); + titleMap.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k))); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "其他福利起始缴纳月"), "otherStartTime")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "其他福利最后缴纳月"), "otherEndTime")); + return list; + } + + public Map> buildColumnTitle(List insuranceArchivesEmployeePOS) { + + boolean welBaseDiffSign = isDiffWelBase(); + + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + Map> result = new HashMap<>(); + + insuranceArchivesEmployeePOS = insuranceArchivesEmployeePOS.stream() + .filter(f -> f.getEmployeeId() != null) + .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(InsuranceArchivesEmployeePO::getEmployeeId))), ArrayList::new)); + try { + + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); + OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); + ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); + + Set socialSet = new HashSet<>(); + Set fundSet = new HashSet<>(); + Set otherSet = new HashSet<>(); + + Set socialComSet = new HashSet<>(); + Set fundComSet = new HashSet<>(); + Set otherComSet = new HashSet<>(); + + insuranceArchivesEmployeePOS.forEach(item -> { + List socialList = socialSchemeMapper.getSocialByEmployeeId(Collections.singletonList(item.getEmployeeId())); + encryptUtil.decryptList(socialList, InsuranceArchivesSocialSchemePO.class); + List fundList = fundSchemeMapper.getFundByEmployeeId(Collections.singletonList(item.getEmployeeId())); + encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); + List otherList = otherSchemeMapper.getOtherByEmployeeId(Collections.singletonList(item.getEmployeeId())); + encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); + if (socialList.size() > 0) { + for (InsuranceArchivesSocialSchemePO socialSchemePO : socialList) { + + Map socialJson = JSON.parseObject(socialSchemePO.getSocialPaymentBaseString(), new TypeReference>() { + }); + if (socialJson != null) { + socialJson.forEach((k, v) -> socialSet.add(k)); + } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map socialComJson = JSON.parseObject(socialSchemePO.getSocialPaymentComBaseString(), new TypeReference>() { + }); + if (socialComJson != null) { + socialComJson.forEach((k, v) -> socialComSet.add(k)); + } + } + } + + } + if (fundList.size() > 0) { + for (InsuranceArchivesFundSchemePO fundSchemePO : fundList) { + Map fundJson = JSON.parseObject(fundSchemePO.getFundPaymentBaseString(), new TypeReference>() { + }); + if (fundJson != null) { + fundJson.forEach((k, v) -> fundSet.add(k)); + } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map fundComJson = JSON.parseObject(fundSchemePO.getFundPaymentComBaseString(), new TypeReference>() { + }); + if (fundComJson != null) { + fundComJson.forEach((k, v) -> fundComSet.add(k)); + } + } + } + + } + if (otherList.size() > 0) { + for (InsuranceArchivesOtherSchemePO otherSchemePO : otherList) { + Map otherJson = JSON.parseObject(otherSchemePO.getOtherPaymentBaseString(), new TypeReference>() { + }); + if (otherJson != null) { + otherJson.forEach((k, v) -> otherSet.add(k)); + } + //如果需要区分个人和公司福利基数 + if (welBaseDiffSign) { + Map otherComJson = JSON.parseObject(otherSchemePO.getOtherPaymentComBaseString(), new TypeReference>() { + }); + if (otherComJson != null) { + otherComJson.forEach((k, v) -> otherComSet.add(k)); + } + } + } + + } + }); + Map socialMap = new HashMap<>(); + Map socialComMap = new HashMap<>(); + Map socialCollect = new HashMap<>(); + Map customSocial = iCategoryMapper.listByWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), null) + .stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); + + Map sysSocial = iCategoryMapper.listByWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), DataTypeEnum.SYSTEM.getValue()) + .stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); + + socialCollect.putAll(customSocial); + socialCollect.putAll(sysSocial); + + if (welBaseDiffSign) { + socialSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName() + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + }); + socialComSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName() + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + }); + } else { + socialSet.forEach(item -> { + if (socialCollect.containsKey(Long.valueOf(item))) { + socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } + }); + } + Map fundMap = new HashMap<>(); + Map fundComMap = new HashMap<>(); + Map fundCollect = new HashMap<>(); + Map customFund = iCategoryMapper.listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), null).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); + Map sysFund = iCategoryMapper.listByWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); + fundCollect.putAll(customFund); + fundCollect.putAll(sysFund); + if (welBaseDiffSign) { + fundSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName() + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + }); + fundComSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName() + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + }); + } else { + fundSet.forEach(item -> { + if (fundCollect.containsKey(Long.valueOf(item))) { + fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } + }); + } + Map otherMap = new HashMap<>(); + Map otherComMap = new HashMap<>(); + Map otherCollect = new HashMap<>(); + Map customOther = iCategoryMapper.listByWelfareType(WelfareTypeEnum.OTHER.getValue(), null).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); + Map sysOther = iCategoryMapper.listByWelfareType(WelfareTypeEnum.OTHER.getValue(), DataTypeEnum.SYSTEM.getValue()).stream().collect(Collectors.toMap(ICategoryPO::getId, Function.identity())); + otherCollect.putAll(customOther); + otherCollect.putAll(sysOther); + + if (welBaseDiffSign) { + otherSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName() + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"个人")); + } + }); + otherComSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName() + + SalaryI18nUtil.getI18nLabel(0, "申报基数") + + SalaryI18nUtil.getI18nLabel(0,"单位")); + } + }); + } else { + otherSet.forEach(item -> { + if (otherCollect.containsKey(Long.valueOf(item))) { + otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数")); + } + }); + } + // map根据key排序 + LinkedHashMap socialMapWithAscKey = socialMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap fundMapWithAscKey = fundMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap otherMapWithAscKey = otherMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + if (welBaseDiffSign) { + LinkedHashMap socialComMapWithAscKey = socialComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap fundComMapWithAscKey = fundComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + LinkedHashMap otherComMapWithAscKey = otherComMap.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, + LinkedHashMap::new)); + socialMapWithAscKey.putAll(socialComMapWithAscKey); + fundMapWithAscKey.putAll(fundComMapWithAscKey); + otherMapWithAscKey.putAll(otherComMapWithAscKey); + } + + result.put(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), socialMapWithAscKey); + result.put(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), fundMapWithAscKey); + result.put(WelfareTypeEnum.OTHER.getValue(), otherMapWithAscKey); + return result; + } finally { + sqlSession.close(); + } + + + } + + /** + * 获取福利档案基数调整记录 + * + */ + public List getAdjustHistoryList(Long paymentOrganization, Long employeeId) { + + if (paymentOrganization == null && employeeId == null) { + return null; + } + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceBaseAdjustHistoryMapper mapper = sqlSession.getMapper(InsuranceBaseAdjustHistoryMapper.class); + List list = mapper.listByEmployeeIdAndPayOrg(paymentOrganization, employeeId); + return list; + } finally { + sqlSession.close(); + } + } + + /** + * 获取福利档案基数调整记录 + * + */ + public List getBaseHistoryByEmployeeIdAndOperator(Long operator, Long employeeId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceBaseAdjustHistoryMapper mapper = sqlSession.getMapper(InsuranceBaseAdjustHistoryMapper.class); + List empList = mapper.listByEmployeeIdAndOperator(operator, employeeId); + List extEmpList = mapper.listByExtEmpIdAndOperator(operator, employeeId); + if (extEmpList != null) { + empList.addAll(extEmpList); + empList = empList.stream().filter(f -> org.apache.commons.lang.StringUtils.isNotBlank(f.getEmployeeName())) + .sorted(Comparator.comparing(InsuranceArchivesBaseHistoryDTO::getOperateTime).reversed()).collect(Collectors.toList()); + } + return empList; + } finally { + sqlSession.close(); + } + } + + //生成基数调整记录（基数单元未变化则忽略） + public List createAdjustInfo(InsuranceArchivesBaseHistoryDTO adjustInfo, Long creator) { + Date now = new Date(); + boolean welBaseDiffSign = isDiffWelBase(); + + List toCreateAdjustHistoryList = new ArrayList<>(); + //旧档案不存在基数信息，则直接遍历新的基数数据，生成调整记录；旧档案存在基数信息，则合并新旧基数数据，遍历合并后的技术数据中的key，生成调整记录。 + if(org.apache.commons.lang.StringUtils.isNotBlank(adjustInfo.getAdjustAfterBaseJson()) && org.apache.commons.lang.StringUtils.isBlank(adjustInfo.getAdjustBeforeBaseJson())) { + Map adjustAfterBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterBaseJson(), new TypeReference>() { + }); + for (String key : adjustAfterBaseMap.keySet()) { + InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO(); + BeanUtils.copyProperties(adjustInfo, adjustItem); + adjustItem.setAdjustWelfareItemId(Long.valueOf(key)); + adjustItem.setAdjustAfterBaseValue((String) adjustAfterBaseMap.get(key)); + adjustItem.setOperateTime(now); + adjustItem.setOperator(creator); + adjustItem.setCreator(creator); + adjustItem.setCreateTime(now); + adjustItem.setUpdateTime(now); + adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope(welBaseDiffSign ? PaymentScopeEnum.SCOPE_PERSON.getValue().toString() : PaymentScopeEnum.SCOPE_PERSON.getValue().toString() + "," + PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); + toCreateAdjustHistoryList.add(adjustItem); + } + } else if (org.apache.commons.lang.StringUtils.isNotBlank(adjustInfo.getAdjustAfterBaseJson()) && org.apache.commons.lang.StringUtils.isNotBlank(adjustInfo.getAdjustBeforeBaseJson())) { + Map adjustAfterBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterBaseJson(), new TypeReference>() { + }); + Map adjustBeforeBaseMap = JSON.parseObject(adjustInfo.getAdjustBeforeBaseJson(), new TypeReference>() { + }); + Map reDealMap = new HashMap<>(); + if (adjustAfterBaseMap != null) { + reDealMap.putAll(adjustAfterBaseMap); + } + if (adjustBeforeBaseMap != null) { + reDealMap.putAll(adjustBeforeBaseMap); + } + if (reDealMap.size() >0) { + for (String key : reDealMap.keySet()) { + String beforeValue = (String) adjustBeforeBaseMap.get(key); + String afterValue = (String) adjustAfterBaseMap.get(key); + if (SalaryEntityUtil.empty2Zero(beforeValue).compareTo(SalaryEntityUtil.empty2Zero(afterValue)) == 0) { + continue; + } + InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO(); + BeanUtils.copyProperties(adjustInfo, adjustItem); + adjustItem.setAdjustWelfareItemId(Long.valueOf(key)); + adjustItem.setAdjustBeforeBaseValue(beforeValue); + adjustItem.setAdjustAfterBaseValue(afterValue); + adjustItem.setOperateTime(now); + adjustItem.setOperator(creator); + adjustItem.setCreator(creator); + adjustItem.setCreateTime(now); + adjustItem.setUpdateTime(now); + adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope(welBaseDiffSign ? PaymentScopeEnum.SCOPE_PERSON.getValue().toString() : PaymentScopeEnum.SCOPE_PERSON.getValue().toString() + "," + PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); + + toCreateAdjustHistoryList.add(adjustItem); + } + } + + } + //如果系统应用设置拆分了个人和公司福利基数，则对adjustBeforeComBaseJson，adjustAfterComBaseJson也进行处理 + if (welBaseDiffSign) { + //旧档案不存在基数信息，则直接遍历新的基数数据，生成调整记录；旧档案存在基数信息，则合并新旧基数数据，遍历合并后的技术数据中的key，生成调整记录。 + if(org.apache.commons.lang.StringUtils.isNotBlank(adjustInfo.getAdjustAfterComBaseJson()) && org.apache.commons.lang.StringUtils.isBlank(adjustInfo.getAdjustBeforeComBaseJson())) { + Map adjustAfterComBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterComBaseJson(), new TypeReference>() { + }); + for (String key : adjustAfterComBaseMap.keySet()) { + InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO(); + BeanUtils.copyProperties(adjustInfo, adjustItem); + adjustItem.setAdjustWelfareItemId(Long.valueOf(key)); + adjustItem.setAdjustAfterBaseValue((String) adjustAfterComBaseMap.get(key)); + adjustItem.setOperateTime(now); + adjustItem.setOperator(creator); + adjustItem.setCreator(creator); + adjustItem.setCreateTime(now); + adjustItem.setUpdateTime(now); + adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope(PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); + toCreateAdjustHistoryList.add(adjustItem); + } + } else if (org.apache.commons.lang.StringUtils.isNotBlank(adjustInfo.getAdjustAfterComBaseJson()) && org.apache.commons.lang.StringUtils.isNotBlank(adjustInfo.getAdjustBeforeComBaseJson())) { + Map adjustAfterComBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterComBaseJson(), new TypeReference>() { + }); + Map adjustBeforeComBaseMap = JSON.parseObject(adjustInfo.getAdjustBeforeComBaseJson(), new TypeReference>() { + }); + Map reDealMap = new HashMap<>(); + if (adjustAfterComBaseMap != null) { + reDealMap.putAll(adjustAfterComBaseMap); + } + if (adjustBeforeComBaseMap != null) { + reDealMap.putAll(adjustBeforeComBaseMap); + } + if (reDealMap.size() >0) { + for (String key : reDealMap.keySet()) { + String beforeValue = (String) adjustBeforeComBaseMap.get(key); + String afterValue = (String) adjustAfterComBaseMap.get(key); + if (SalaryEntityUtil.empty2Zero(beforeValue).compareTo(SalaryEntityUtil.empty2Zero(afterValue)) == 0) { + continue; + } + InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO(); + BeanUtils.copyProperties(adjustInfo, adjustItem); + adjustItem.setAdjustWelfareItemId(Long.valueOf(key)); + adjustItem.setAdjustBeforeBaseValue(beforeValue); + adjustItem.setAdjustAfterBaseValue(afterValue); + adjustItem.setOperateTime(now); + adjustItem.setOperator(creator); + adjustItem.setCreator(creator); + adjustItem.setCreateTime(now); + adjustItem.setUpdateTime(now); + adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); + adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY); + adjustItem.setId(IdGenerator.generate()); + adjustItem.setPaymentScope( PaymentScopeEnum.SCOPE_COMPANY.getValue().toString()); + + toCreateAdjustHistoryList.add(adjustItem); + } + } + + } + } + return toCreateAdjustHistoryList; + } + + /** + * 新增福利档案基数调整记录 + * + */ + @Override + public void batchInsertAdjustHistory(List adjustHistoryList) { + + if (org.apache.commons.collections.CollectionUtils.isEmpty(adjustHistoryList)) { + return; + } + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceBaseAdjustHistoryMapper mapper = sqlSession.getMapper(InsuranceBaseAdjustHistoryMapper.class); + List> partition = Lists.partition(adjustHistoryList, 100); + partition.forEach(mapper::batchSave); + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } + + public Map getBaseForm(WelfareTypeEnum welfareType, Long employeeId, Long paymentOrganization, Collection taxAgentPOS) { + Map data = new HashMap<>(16); + SalaryAssert.notNull(employeeId, SalaryI18nUtil.getI18nLabel(0, "员工id不可为空")); + List employeeByIds = getSalaryEmployeeService(user).getEmployeeByIdsAll(Collections.singletonList(employeeId)); + SalaryAssert.notEmpty(employeeByIds, SalaryI18nUtil.getI18nLabel(0, "员工信息不存在")); + DataCollectionEmployee item = employeeByIds.get(0); + + + if (welfareType == null) { + //基础信息表单 + InsuranceArchivesBaseDTO insuranceArchivesBaseDTO = InsuranceArchivesBaseDTO.builder().department(item.getDepartmentName()) + .hiredate(item.getCompanystartdate()) + .position(item.getJobtitleName()) + .username(item.getUsername()) + .telephone(item.getMobile()) + .dimissionDate(item.getDismissdate()) + .build(); + + data.put("data", insuranceArchivesBaseDTO); + return data; + } + + SISchemeBiz siSchemeBiz = new SISchemeBiz(); + List list = siSchemeBiz.listAll(); + // 过滤可见性范围 + list = filterList(list, taxAgentPOS); + List selectItems = new ArrayList<>(); + List addGroups = new ArrayList<>(); + List paymentOptions = paymentOrganizationOptions(taxAgentPOS); + List underTakeOptions = Arrays.stream(UndertakerEnum.values()) + .map(e -> new SearchConditionOption(e.getValue().toString(), e.getDefaultLabel())).collect(Collectors.toList()); + + + //返回数据 + switch (welfareType) { + case SOCIAL_SECURITY: + InsuranceArchivesSocialSchemeDTO insuranceArchivesSocialSchemeDTO = buildSocialForm(employeeId, paymentOrganization); + List socialList = list.stream().filter(e -> Objects.equals(e.getWelfareType(), WelfareTypeEnum.SOCIAL_SECURITY.getValue())).collect(Collectors.toList()); + List socialOptions = new ArrayList<>(); + socialList.forEach(social -> { + socialOptions.add(new SearchConditionOption(Util.null2String(social.getId()), social.getSchemeName())); + }); + SearchConditionItem socialName = SalaryFormItemUtil.selectItem(user, socialOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "社保方案名称"), "socialSchemeId"); + SearchConditionItem organizationName = SalaryFormItemUtil.selectItem(user, paymentOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "社保缴纳组织"), "paymentOrganization"); + SearchConditionItem underTakeName = SalaryFormItemUtil.selectItem(user, underTakeOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "社保个人实际承担方"), "underTake"); + + selectItems.add(socialName); + selectItems.add(organizationName); + selectItems.add(underTakeName); + + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "社保基础信息"), true, selectItems)); + data.put("data", insuranceArchivesSocialSchemeDTO); + data.put("items", addGroups); + break; + case ACCUMULATION_FUND: + InsuranceArchivesFundSchemeDTO insuranceArchivesFundSchemeDTO = buildFundForm(employeeId, paymentOrganization); + List fundList = list.stream().filter(e -> Objects.equals(e.getWelfareType(), WelfareTypeEnum.ACCUMULATION_FUND.getValue())).collect(Collectors.toList()); + List fundOptions = new ArrayList<>(); + fundList.forEach(social -> { + fundOptions.add(new SearchConditionOption(Util.null2String(social.getId()), social.getSchemeName())); + }); + SearchConditionItem fundName = SalaryFormItemUtil.selectItem(user, fundOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "公积金方案名称"), "fundSchemeId"); + SearchConditionItem organizationFundName = SalaryFormItemUtil.selectItem(user, paymentOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "公积金缴纳组织"), "paymentOrganization"); + SearchConditionItem underTakeFundName = SalaryFormItemUtil.selectItem(user, underTakeOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "公积金个人实际承担方"), "underTake"); + + selectItems.add(fundName); + selectItems.add(organizationFundName); + selectItems.add(underTakeFundName); + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "公积金基础信息"), true, selectItems)); + data.put("data", insuranceArchivesFundSchemeDTO); + data.put("items", addGroups); + break; + case OTHER: + InsuranceArchivesOtherSchemeDTO insuranceArchivesOtherSchemeDTO = buildOtherForm(employeeId, paymentOrganization); + List otherList = list.stream().filter(e -> Objects.equals(e.getWelfareType(), WelfareTypeEnum.OTHER.getValue())).collect(Collectors.toList()); + List otherOptions = new ArrayList<>(); + otherList.forEach(social -> { + otherOptions.add(new SearchConditionOption(Util.null2String(social.getId()), social.getSchemeName())); + }); + SearchConditionItem otherName = SalaryFormItemUtil.selectItem(user, otherOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "其他福利名称"), "otherSchemeId"); + SearchConditionItem organizationOtherName = SalaryFormItemUtil.selectItem(user, paymentOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "其他福利缴纳组织"), "paymentOrganization"); + SearchConditionItem underTakeOtherName = SalaryFormItemUtil.selectItem(user, underTakeOptions, 2, 12, 6, false, SalaryI18nUtil.getI18nLabel(0, "其他福利个人实际承担方"), "underTake"); + + selectItems.add(otherName); + selectItems.add(organizationOtherName); + selectItems.add(underTakeOtherName); + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "其他福利基础信息"), true, selectItems)); + data.put("data", insuranceArchivesOtherSchemeDTO); + data.put("items", addGroups); + break; + default: + } + return data; + } + + /*** + * @description 过滤没有权限访问的 + * @return List + * @author Harryxzy + * @date 2022/9/19 18:32 + */ + List filterList(List list, Collection taxAgentPOS){ + List ids = taxAgentPOS.stream().map(i -> String.valueOf(i.getId())).collect(Collectors.toList()); + List result = list.stream().filter(item -> { + boolean flag = true; + if (item.getSharedType()!= null && item.getSharedType().equals("1")) { + flag = false; + String taxAgentIds = item.getTaxAgentIds(); + if(org.apache.commons.lang.StringUtils.isNotBlank(taxAgentIds)){ + String splitFlag = ","; + String[] split = taxAgentIds.split(splitFlag); + for (int i = 0; i < split.length; i++) { + if (ids.contains(split[i])) { + flag = true; + } + } + } + } + return flag; + }).collect(Collectors.toList()); + return result; + } + + /** + * 社保缴纳组织 + * + * @return + */ + public List paymentOrganizationOptions(Collection taxAgentPOS) { + Collection list = taxAgentPOS; + if (org.apache.commons.collections.CollectionUtils.isEmpty(list)) { + return new ArrayList<>(); + } + return list + .stream() + .map(item -> new SearchConditionOption(String.valueOf(item.getId()), item.getName())).collect(Collectors.toList()); + } + + /** + * 其它基础表单 + * + * @param employeeId + * @return + */ + public InsuranceArchivesOtherSchemeDTO buildOtherForm(Long employeeId, Long paymentOrganization) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); + List otherList = otherSchemeMapper.getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrganization) + .build()); + encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); + InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = otherList.size() != 0 ? otherList.get(0) : null; + InsuranceArchivesOtherSchemeDTO data = InsuranceArchivesBO.convertOtherPOtoDTO(insuranceArchivesOtherSchemePO, employeeId); + if (insuranceArchivesOtherSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); + } + return data; + } finally { + sqlSession.close(); + } + + } + + /** + * 公积金基础表单 + * + * @param employeeId + * @return + */ + public InsuranceArchivesFundSchemeDTO buildFundForm(Long employeeId, Long paymentOrganization) { + + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); + List fundList = fundSchemeMapper.getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrganization) + .build()); + encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); + InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = fundList.size() != 0 ? fundList.get(0) : null; + InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId); + if (insuranceArchivesFundSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); + } + return data; + } finally { + sqlSession.close(); + } + + } + + /** + * 社保基础表单 + * + * @param employeeId + * @return + */ + public InsuranceArchivesSocialSchemeDTO buildSocialForm(Long employeeId, Long paymentOrganization) { + InsuranceArchivesSocialSchemePO insuranceArchivesSocialSchemePO = getSocialByEmployeeId(employeeId, paymentOrganization); + InsuranceArchivesSocialSchemeDTO data = InsuranceArchivesBO.convertSocialPOtoDTO(insuranceArchivesSocialSchemePO, employeeId); + if (insuranceArchivesSocialSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); + } + return data; + } + + /** + * 获取社保档案表 + * + * @param employeeId + * @return + */ + public InsuranceArchivesSocialSchemePO getSocialByEmployeeId(Long employeeId, Long paymentOrganization) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + List socialList = socialSchemeMapper.getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrganization) + .build()); + encryptUtil.decryptList(socialList, InsuranceArchivesSocialSchemePO.class); + return socialList.size() != 0 ? socialList.get(0) : null; + } finally { + sqlSession.close(); + } + } + + /** + * 获取详细表单 + * + * @param user + * @param welfareType + * @param employeeId + * @param schemeId + * @return + */ + public Map getPaymentForm(User user, WelfareTypeEnum welfareType, Long employeeId, Long schemeId, Long paymentOrganization) { + Map data = new HashMap<>(16); + //判断是否要区分个人和单位福利基数 + SalarySysConfPO welBaseDiff = getSalarySysConfService(user).getOneByCode(WEL_BASE_DIFF_BY_PER_AND_COM); + boolean welBaseDiffSign = welBaseDiff != null && welBaseDiff.getConfValue().equals(OpenEnum.OPEN.getValue()); + //判断是否要自动调整基数 + SalarySysConfPO welBaseAutoAdjust = getSalarySysConfService(user).getOneByCode(WEL_BASE_AUTO_ADJUST); + boolean welBaseAutoAdjustSign = welBaseAutoAdjust != null && welBaseAutoAdjust.getConfValue().equals(OpenEnum.OPEN.getValue()); + + switch (welfareType) { + case SOCIAL_SECURITY: + data = buildSocialPaymentForm(user, employeeId, schemeId,welfareType.getValue(), paymentOrganization, welBaseDiffSign, welBaseAutoAdjustSign); + break; + case ACCUMULATION_FUND: + data = buildFundPaymentForm(user, employeeId, schemeId, welfareType.getValue(), paymentOrganization, welBaseDiffSign, welBaseAutoAdjustSign); + break; + case OTHER: + data = buildOtherPaymentForm(user, employeeId, schemeId, welfareType.getValue(), paymentOrganization, welBaseDiffSign, welBaseAutoAdjustSign); + break; + default: + } + return data; + } + + /** + * 其他payForm + * + * @param employeeId + * @param schemeId + * @return + */ + public Map buildOtherPaymentForm(User user, Long employeeId, Long schemeId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign, boolean welBaseAutoAdjustSign) { + Map dataMap = new HashMap<>(); + InsuranceArchivesOtherSchemeDTO data = buildOtherForm(employeeId, paymentOrganization); + Map insuranceValueMap = new HashMap<>(); + Map insuranceComValueMap = new HashMap<>(); + if (data != null) { + insuranceValueMap = StrUtil.isNotBlank(data.getOtherPaymentBaseString()) + ? JSONObject.parseObject(data.getOtherPaymentBaseString(), new TypeReference>() {}) : new HashMap<>(); + if (welBaseDiffSign) { + insuranceComValueMap = StrUtil.isNotBlank(data.getOtherPaymentComBaseString()) + ? JSONObject.parseObject(data.getOtherPaymentComBaseString(), new TypeReference>() {}) : new HashMap<>(); + } + } + List addGroups = new ArrayList<>(); + List inputItems = buildPaymentBase(user, schemeId, welfareType, welBaseDiffSign); + //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 + for (SearchConditionItem item : inputItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("data", insuranceValueMap); + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "其他福利缴纳基数"), true, inputItems)); + dataMap.put("items", addGroups); + if (welBaseDiffSign) { + List addComGroups = new ArrayList<>(); + List inputComItems = buildPaymentComBase(user, schemeId, welfareType); + addComGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "其他福利缴纳基数"), true, inputComItems)); + dataMap.put("comItems", addComGroups); + + for (SearchConditionItem item : inputComItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceComValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceComValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("comData", insuranceComValueMap); + } + return dataMap; + } + + /** + * 公积金payForm + * + * @param employeeId + * @param schemeId + * @return + */ + public Map buildFundPaymentForm(User user, Long employeeId, Long schemeId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign, boolean welBaseAutoAdjustSign) { + + Map dataMap = new HashMap<>(); + InsuranceArchivesFundSchemeDTO data = buildFundForm(employeeId, paymentOrganization); + Map insuranceValueMap = new HashMap<>(); + Map insuranceComValueMap = new HashMap<>(); + if (data != null) { + insuranceValueMap = StrUtil.isNotBlank(data.getFundPaymentBaseString()) + ? JSONObject.parseObject(data.getFundPaymentBaseString(), new TypeReference>() {}) : new HashMap<>(); + if (welBaseDiffSign) { + insuranceComValueMap = StrUtil.isNotBlank(data.getFundPaymentComBaseString()) + ? JSONObject.parseObject(data.getFundPaymentComBaseString(), new TypeReference>() {}) : new HashMap<>(); + } + } + + List addGroups = new ArrayList<>(); + List inputItems = buildPaymentBase(user, schemeId, welfareType, welBaseDiffSign); + //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 + for (SearchConditionItem item : inputItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("data", insuranceValueMap); + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "公积金缴纳基数"), true, inputItems)); + dataMap.put("items", addGroups); + if (welBaseDiffSign) { + List addComGroups = new ArrayList<>(); + List inputComItems = buildPaymentComBase(user, schemeId, welfareType); + addComGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "公积金缴纳基数"), true, inputComItems)); + dataMap.put("comItems", addComGroups); + + for (SearchConditionItem item : inputComItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceComValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceComValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("comData", insuranceComValueMap); + } + return dataMap; + } + + /** + * 社保payForm + * + * @param employeeId + * @param schemeId + * @return + */ + public Map buildSocialPaymentForm(User user, Long employeeId, Long schemeId, Integer welfareType, Long paymentOrganization, boolean welBaseDiffSign, boolean welBaseAutoAdjustSign) { + Map dataMap = new HashMap<>(); + InsuranceArchivesSocialSchemeDTO data = buildSocialForm(employeeId, paymentOrganization); + Map insuranceValueMap = new HashMap<>(); + Map insuranceComValueMap = new HashMap<>(); + if (data != null) { + insuranceValueMap = StrUtil.isNotBlank(data.getSchemePaymentBaseString()) + ? JSONObject.parseObject(data.getSchemePaymentBaseString(), new TypeReference>() {}) : new HashMap<>(); + if (welBaseDiffSign) { + insuranceComValueMap = StrUtil.isNotBlank(data.getSchemePaymentComBaseString()) + ? JSONObject.parseObject(data.getSchemePaymentComBaseString(), new TypeReference>() {}) : new HashMap<>(); + } + } + + List addGroups = new ArrayList<>(); + List inputItems = buildPaymentBase(user, schemeId, welfareType, welBaseDiffSign); + //如果查询结果中存在 方案中缺失福利险种的值，设置初始值 + for (SearchConditionItem item : inputItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("data", insuranceValueMap); + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "社保缴纳基数"), true, inputItems)); + dataMap.put("items", addGroups); + if (welBaseDiffSign) { + List addComGroups = new ArrayList<>(); + List inputComItems = buildPaymentComBase(user, schemeId, welfareType); + addComGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0, "社保缴纳基数"), true, inputComItems)); + dataMap.put("comItems", addComGroups); + + for (SearchConditionItem item : inputComItems) { + String insuranceId = item.getDomkey().length > 0 ? item.getDomkey()[0] : null; + if (StrUtil.isNotBlank(insuranceId) && insuranceComValueMap.get(insuranceId) == null) { + String basicValue = welBaseAutoAdjustSign ? ("0.000".equals(item.getMin()) ? "0" : item.getMin()) : "0"; + insuranceComValueMap.put(insuranceId, basicValue); + } + } + dataMap.put("comData", insuranceComValueMap); + } + return dataMap; + + } + + /** + * 构造payment(items) + * + * @param schemeId + * @return + */ + public List buildPaymentBase(User user, Long schemeId, Integer welfareType, boolean welBaseDiffSign) { + List inputItems = new ArrayList<>(); + if (schemeId == null) { + return new ArrayList<>(); + } + List list = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() + .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_PERSON.getValue())).collect(Collectors.toList()); + if (!welBaseDiffSign) { + List perInsuranceIdList = list.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); + List moreComList = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() + .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_COMPANY.getValue()) && !perInsuranceIdList.contains(f.getInsuranceId())).collect(Collectors.toList()); + if (moreComList.size() > 0) { + list.addAll(moreComList); + } + } + + SICategoryBiz siCategoryBiz = new SICategoryBiz(); + list.forEach(insuranceSchemeDetail -> { + ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); + if (iCategoryPO != null) { +// inputItems.add(SalaryFormItemUtil.inputNumberItem(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()))); + inputItems.add(SalaryFormItemUtil.inputNumberItemWithMaxAndMin(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()) + , insuranceSchemeDetail.getUpperLimit(), insuranceSchemeDetail.getLowerLimit())); + } + }); + return inputItems; + } + + public List buildPaymentComBase(User user, Long schemeId, Integer welfareType) { + List inputItems = new ArrayList<>(); + if (schemeId == null) { + return new ArrayList<>(); + } + List list = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() + .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_COMPANY.getValue())).collect(Collectors.toList()); + SICategoryBiz siCategoryBiz = new SICategoryBiz(); + list.forEach(insuranceSchemeDetail -> { + ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); + if (iCategoryPO != null) { +// inputItems.add(SalaryFormItemUtil.inputNumberItem(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()))); + inputItems.add(SalaryFormItemUtil.inputNumberItemWithMaxAndMin(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()) + , insuranceSchemeDetail.getUpperLimit(), insuranceSchemeDetail.getLowerLimit())); + } + }); + return inputItems; + } + + /** + * 获取方案明细 + * + * @param schemeId + * @return + */ + public List queryListByPrimaryIdIsPayment(Long schemeId, Integer welfareType) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListByPrimaryIdIsPayment(schemeId, IsPaymentEnum.YES.getValue(), welfareType); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPOS; + } finally { + sqlSession.close(); + } + } + + public void otherSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { + long employeeId = user.getUID(); + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); + + InsuranceArchivesOtherSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesOtherSaveParam.class); + SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0, "员工id为空"), param, param.getEmployeeId()); + + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) && !SalaryDateUtil.checkYearMonth(param.getOtherStartTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "其他福利起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) && !SalaryDateUtil.checkYearMonth(param.getOtherEndTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "其他福利最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + + List otherIds = new ArrayList(); + otherIds.add(param.getId()); + List oldOtherInfoList = otherSchemeMapper.getOtherById(otherIds); + + //设置福利档案基数调整记录数据 + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(param.getOtherSchemeId()) + .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + + if (oldOtherInfoList.size() == 1) { + InsuranceArchivesOtherSchemePO oldOtherInfo = oldOtherInfoList.get(0); + //设置福利档案基数调整记录数据 + encryptUtil.decrypt(oldOtherInfo, InsuranceArchivesOtherSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldOtherInfo.getOtherPaymentBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldOtherInfo.getOtherSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldOtherInfo.getOtherPaymentComBaseString()); + //新数据 + InsuranceArchivesOtherSchemePO updateOtherInfo = + InsuranceArchivesOtherSchemePO.builder() + .id(oldOtherInfo.getId()) + .otherSchemeId(param.getOtherSchemeId()) + .otherStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) ? param.getOtherStartTime() : null) + .underTake(param.getUnderTake()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .welfareType(paramReq.getWelfareType().getValue()) + .otherEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) ? param.getOtherEndTime() : null) + .employeeId(param.getEmployeeId()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .updateTime(new Date()) + .nonPayment(param.getNonPayment()) + .creator(employeeId) + .paymentOrganization(param.getPaymentOrganization()) + .otherPaymentBaseString(paramReq.getPaymentForm()) + .build(); + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + } + encryptUtil.encrypt(updateOtherInfo, InsuranceArchivesOtherSchemePO.class); + otherSchemeMapper.updateById(updateOtherInfo); + //更新base_info表状态 + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + //对于非系统人员，编辑后状态切换为正在缴纳 + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + baseInfoPO.setOtherArchivesId(updateOtherInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + sqlSession.commit(); + } else { + otherSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesOtherSchemePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + //新建社保档案，并关联主表 + InsuranceArchivesOtherSchemePO insertOtherInfo = InsuranceArchivesOtherSchemePO.builder() + .otherSchemeId(param.getOtherSchemeId()) + .otherStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) ? param.getOtherStartTime() : null) + .underTake(param.getUnderTake()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .welfareType(paramReq.getWelfareType().getValue()) + .otherEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) ? param.getOtherEndTime() : null) + .employeeId(param.getEmployeeId()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .createTime(new Date()) + .updateTime(new Date()) + .nonPayment(param.getNonPayment()) + .creator(employeeId) + .paymentOrganization(param.getPaymentOrganization()) + .otherPaymentBaseString(paramReq.getPaymentForm()) + .build(); + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + } + encryptUtil.encrypt(insertOtherInfo, InsuranceArchivesOtherSchemePO.class); + otherSchemeMapper.insert(insertOtherInfo); + sqlSession.commit(); + + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null) { + List otherInfos = otherSchemeMapper.getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + baseInfoPO.setOtherArchivesId(otherInfos.get(0).getId()); + //对于非系统人员，编辑后状态切换为正在缴纳 + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); + } + } + + //生成福利档案基数调整记录数据 + List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); + //福利档案基数调整记录数据入库 + batchInsertAdjustHistory(adjustHistoryList); + + } finally { + sqlSession.close(); + } + } + + /** + * @param paramReq + * @param + */ + public void fundSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { + long employeeId = user.getUID(); + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); + InsuranceArchivesFundSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesFundSaveParam.class); + SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0,"员工id为空"), param, param.getEmployeeId()); + + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) && !SalaryDateUtil.checkYearMonth(param.getFundStartTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "公积金起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) && !SalaryDateUtil.checkYearMonth(param.getFundEndTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "公积金最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + + List fundIds = new ArrayList(); + fundIds.add(param.getId()); + List oldFundInfoList = fundSchemeMapper.getFundById(fundIds); + + //设置福利档案基数调整记录数据 + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(param.getFundSchemeId()) + .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + + if (oldFundInfoList.size() == 1) { + InsuranceArchivesFundSchemePO oldFundInfo = oldFundInfoList.get(0); + //设置福利档案基数调整记录数据 + encryptUtil.decrypt(oldFundInfo, InsuranceArchivesFundSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldFundInfo.getFundPaymentBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldFundInfo.getFundSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldFundInfo.getFundPaymentComBaseString()); + //新数据 + InsuranceArchivesFundSchemePO updateFundInfo = InsuranceArchivesFundSchemePO.builder() + .id(oldFundInfo.getId()) + .fundSchemeId(param.getFundSchemeId()) + .fundAccount(param.getFundAccount()) + .fundEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) ? param.getFundEndTime() : null) + .fundStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) ? param.getFundStartTime() : null) + .fundPaymentBaseString(paramReq.getPaymentForm()) + .supplementFundAccount(param.getSupplementFundAccount()) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .underTake(param.getUnderTake()) + .paymentOrganization(param.getPaymentOrganization()) + .updateTime(new Date()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .build(); + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + } + encryptUtil.encrypt(updateFundInfo, InsuranceArchivesFundSchemePO.class); + fundSchemeMapper.updateById(updateFundInfo); + //更新base_info表状态 + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + //对于非系统人员，编辑后状态切换为正在缴纳 + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + baseInfoPO.setFundArchivesId(updateFundInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + sqlSession.commit(); + } else { + fundSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesFundSchemePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + //新建社保档案，并关联主表 + InsuranceArchivesFundSchemePO insertFundInfo = InsuranceArchivesFundSchemePO.builder() + .fundSchemeId(param.getFundSchemeId()) + .fundAccount(param.getFundAccount()) + .fundEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) ? param.getFundEndTime() : null) + .fundStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) ? param.getFundStartTime() : null) + .fundPaymentBaseString(paramReq.getPaymentForm()) + .supplementFundAccount(param.getSupplementFundAccount()) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .underTake(param.getUnderTake()) + .paymentOrganization(param.getPaymentOrganization()) + .createTime(new Date()) + .updateTime(new Date()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .build(); + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + } + encryptUtil.encrypt(insertFundInfo, InsuranceArchivesFundSchemePO.class); + fundSchemeMapper.insert(insertFundInfo); + sqlSession.commit(); + + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null) { + List fundInfos = fundSchemeMapper.getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + baseInfoPO.setFundArchivesId(fundInfos.get(0).getId()); + //对于非系统人员，编辑后状态切换为正在缴纳 + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); + } + + } + + //生成福利档案基数调整记录数据 + List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); + //福利档案基数调整记录数据入库 + batchInsertAdjustHistory(adjustHistoryList); + + } finally { + sqlSession.close(); + } + + } + + /** + * @param paramReq + * @param + */ + public void socialSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { + long employeeId = user.getUID(); + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + + InsuranceArchivesSocialSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesSocialSaveParam.class); + SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0,"员工id为空"), param, param.getEmployeeId()); + + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) && !SalaryDateUtil.checkYearMonth(param.getSocialStartTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "社保起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) && !SalaryDateUtil.checkYearMonth(param.getSocialEndTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "社保最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + +// //删除社保数据 +// socialSchemeMapper.batchDeleteByEmployeeIds(Collections.singletonList(param.getEmployeeId())); + + //查询已有数据 + List socialIds = new ArrayList(); + socialIds.add(param.getId()); + List oldSocialInfoList = socialSchemeMapper.getSocialById(socialIds); + + //设置福利档案基数调整记录数据 + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(param.getSocialSchemeId()) + .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + + //组装新数据 + if (oldSocialInfoList.size() == 1) { + //老数据 + InsuranceArchivesSocialSchemePO oldSocialInfo = oldSocialInfoList.get(0); + //设置福利档案基数调整记录数据 + encryptUtil.decrypt(oldSocialInfo, InsuranceArchivesSocialSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldSocialInfo.getSocialPaymentBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldSocialInfo.getSocialSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldSocialInfo.getSocialPaymentComBaseString()); + //新数据 + InsuranceArchivesSocialSchemePO updateSocialInfo = + InsuranceArchivesSocialSchemePO.builder() + .id(oldSocialInfo.getId()) + .welfareType(paramReq.getWelfareType().getValue()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .socialPaymentBaseString(paramReq.getPaymentForm()) + .socialSchemeId(param.getSocialSchemeId()) + .socialEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) ? param.getSocialEndTime() : null) + .socialStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) ? param.getSocialStartTime() : null) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .employeeId(param.getEmployeeId()) + .updateTime(new Date()) + .underTake(param.getUnderTake()) + .socialAccount(param.getSchemeAccount()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + } + encryptUtil.encrypt(updateSocialInfo, InsuranceArchivesSocialSchemePO.class); + socialSchemeMapper.updateById(updateSocialInfo); + //更新base_info表状态 + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + //对于非系统人员，编辑后状态切换为正在缴纳 + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + baseInfoPO.setSocialArchivesId(updateSocialInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + sqlSession.commit(); + } else { + socialSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesSocialSchemePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + //新建社保档案，并关联主表 + InsuranceArchivesSocialSchemePO insertSocialInfo = + InsuranceArchivesSocialSchemePO.builder() + .welfareType(paramReq.getWelfareType().getValue()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .socialPaymentBaseString(paramReq.getPaymentForm()) + .socialSchemeId(param.getSocialSchemeId()) + .socialEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) ? param.getSocialEndTime() : null) + .socialStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) ? param.getSocialStartTime() : null) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .employeeId(param.getEmployeeId()) + .createTime(new Date()) + .updateTime(new Date()) + .underTake(param.getUnderTake()) + .socialAccount(param.getSchemeAccount()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + } + encryptUtil.encrypt(insertSocialInfo, InsuranceArchivesSocialSchemePO.class); + socialSchemeMapper.insert(insertSocialInfo); + sqlSession.commit(); + + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null) { + List socialInfos = socialSchemeMapper.getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + baseInfoPO.setSocialArchivesId(socialInfos.get(0).getId()); + //对于非系统人员，编辑后状态切换为正在缴纳 + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); + } + + } + + //生成福利档案基数调整记录数据 + List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); + //福利档案基数调整记录数据入库 + batchInsertAdjustHistory(adjustHistoryList); + } finally { + sqlSession.close(); + } + } + + /** + * 校验福利基数是否符合上下限要求 + * @param primaryId + * @param paymentBaseString + * @return + */ + @Override + public Boolean checkWelBaseLimit(Long primaryId, String paymentBaseString, Integer paymentScope) { + + if (primaryId ==null || paymentBaseString == null) { + return true; + } + Map paymentBaseJson = JSON.parseObject(paymentBaseString, new HashMap().getClass()); + if (paymentBaseJson == null) { + return true; + } + + for (Map.Entry entry : paymentBaseJson.entrySet()) { + + //判断福利值是否为空/数字 + if (entry.getValue() == null || entry.getValue().length() == 0) { + continue; + } else if (!isNumeric(entry.getValue())) { + log.info("福利值非数字！"); + return false; + } + + //根据福利方案id、险种id、缴纳对象、缴费状态查询明细 + List insuranceSchemeDetailPOList = getInsuranceSchemeDetailMapper().getByPI(primaryId, Long.valueOf(entry.getKey())); + log.info("福利方案id: {},, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey())); + if (insuranceSchemeDetailPOList.size() == 0) { + log.info("根据福利方案id、险种id、缴纳对象查询明细为null！福利方案id: {}, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey())); + return false; + } + List isPaymentList = insuranceSchemeDetailPOList.stream() + .filter(f -> f.getIsPayment().equals(IsPaymentEnum.YES.getValue()) && f.getPaymentScope().equals(paymentScope)).collect(Collectors.toList()); + if (isPaymentList.size() > 0) { + InsuranceSchemeDetailPO insuranceSchemeDetailPO = isPaymentList.get(0); + + encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); + String lowerLimit = "0.000".equals(insuranceSchemeDetailPO.getLowerLimit()) ? null : insuranceSchemeDetailPO.getLowerLimit(); + String upperLimit = "0.000".equals(insuranceSchemeDetailPO.getUpperLimit()) ? null : insuranceSchemeDetailPO.getUpperLimit(); + if (lowerLimit != null && lowerLimit.length() > 0 && Double.parseDouble(entry.getValue()) < Double.parseDouble(lowerLimit)) { + //数值低于对应福利明细下限 + log.info("社保基数 {} 数值 {} 低于对应福利明细下限 {}！", entry.getKey(), entry.getValue(), lowerLimit); + return false; + } + if (upperLimit != null && upperLimit.length() > 0 && Double.parseDouble(entry.getValue()) > Double.parseDouble(upperLimit)) { + //数值高于对应福利明细上限 + log.info("社保基数 {} 数值 {} 高于对应福利明细上限 {} ！", entry.getKey(), entry.getValue(), upperLimit); + return false; + } + } else { + log.info("福利明细项属于未缴费状态，不对上下限进行约束"); + } + + + } + return true; + } + + + /** + * 校验福利基数是否符合上下限要求，并返回符合要求的数据 + * @param primaryId + * @param paymentBaseString + * @return + */ + @Override + public String checkAndBuildWelBaseWithLimit(Long primaryId, String paymentBaseString, Integer paymentScope) { + + if (primaryId ==null || paymentBaseString == null) { + return paymentBaseString; + } + Map paymentBaseJson = JSON.parseObject(paymentBaseString, HashMap.class); + Map newPaymentBaseJson = JSON.parseObject(paymentBaseString, HashMap.class); + if (paymentBaseJson == null) { + return null; + } + + for (Map.Entry entry : paymentBaseJson.entrySet()) { + + //判断福利值是否为空/数字 + if (entry.getValue() == null || entry.getValue().length() == 0) { + continue; + } else if (!isNumeric(entry.getValue())) { + log.info("福利值非数字！"); + newPaymentBaseJson.remove(entry.getKey()); + continue; + } + //根据福利方案id、险种id + List insuranceSchemeDetailPOList = getInsuranceSchemeDetailMapper().getByPI(primaryId, Long.valueOf(entry.getKey())); + log.info("福利方案id: {},, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey())); + if (insuranceSchemeDetailPOList.size() == 0) { + log.info("根据福利方案id、险种id、缴纳对象查询明细为null！福利方案id: {}, 福利明细项id：{}", primaryId, Long.valueOf(entry.getKey())); + newPaymentBaseJson.remove(entry.getKey()); + continue; + } + List checkList = insuranceSchemeDetailPOList.stream() + .filter(f -> f.getPaymentScope().equals(paymentScope)).collect(Collectors.toList()); + if (checkList.size() > 0) { + InsuranceSchemeDetailPO insuranceSchemeDetailPO = checkList.get(0); + encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); + String lowerLimit = "0.000".equals(insuranceSchemeDetailPO.getLowerLimit()) ? null : insuranceSchemeDetailPO.getLowerLimit(); + String upperLimit = "0.000".equals(insuranceSchemeDetailPO.getUpperLimit()) ? null : insuranceSchemeDetailPO.getUpperLimit(); + if (lowerLimit != null && lowerLimit.length() > 0 && Double.parseDouble(entry.getValue()) < Double.parseDouble(lowerLimit)) { + //数值低于对应福利明细下限 + log.info("社保基数 {} 数值 {} 低于对应福利明细下限 {}！", entry.getKey(), entry.getValue(), lowerLimit); + newPaymentBaseJson.put(entry.getKey(), lowerLimit); + } + if (upperLimit != null && upperLimit.length() > 0 && Double.parseDouble(entry.getValue()) > Double.parseDouble(upperLimit)) { + //数值高于对应福利明细上限 + log.info("社保基数 {} 数值 {} 高于对应福利明细上限 {} ！", entry.getKey(), entry.getValue(), upperLimit); + newPaymentBaseJson.put(entry.getKey(), upperLimit); + } + } + } + return JSON.toJSONString(newPaymentBaseJson); + } + + /** + * 判断字符串是否为整数或者小数或者负数 + */ + public static boolean isNumeric(String str){ + + Pattern pattern = Pattern.compile("^-?\\d+(\\.\\d+)?$"); + Matcher isNum = pattern.matcher(str); + if (!isNum.matches()) { + return false; + } + return true; + + } + + /** + * 档案列表 + *

+ * 这里是一个含有比较多动态字段的列表，用的是手动拼装的方式 + * + * @param param 高级搜索条件 + * @param operateId 操作员id + * @return table + */ + public Map listPage(InsuranceArchivesListParam param, long operateId) { + Map apidatas = new HashMap<>(16); + InsuranceArchivesListParam request = InsuranceArchivesListParam.builder().build(); + if (param.getHireDate() != null && param.getHireDate().length == 2) { + param.setHiredateStart(param.getHireDate()[0]); + param.setHiredateEnd(param.getHireDate()[1]); + } + if (param.getDimissionDate() != null && param.getDimissionDate().length == 2) { + param.setDimissionDateStart(param.getDimissionDate()[0]); + param.setDimissionDateEnd(param.getDimissionDate()[1]); + } + + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getDepartmentIdsStr())) { + request.setDepartmentIds(Arrays.stream(param.getDepartmentIdsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); + } + + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getSubcompanyIdsStr())) { + request.setSubcompanyIds(Arrays.stream(param.getSubcompanyIdsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); + } + + + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getPositionsStr())) { + request.setPositions(Arrays.stream(param.getPositionsStr().split(",")).map(BigDecimal::new).collect(Collectors.toList())); + } + + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getStatusesStr())) { + request.setStatuses(Arrays.stream(param.getStatusesStr().split(",")).map(String::new).collect(Collectors.toList())); + } + + request.setNeedAuth(param.getNeedAuth()); + request.setTaxAgentEmployeeIds(param.getTaxAgentEmployeeIds()); + request.setTaxAgentIds(param.getTaxAgentIds()); + + Integer current = param.getCurrent() == null ? 1 : param.getCurrent(); + Integer pageSize = param.getPageSize() == null ? 10 : param.getPageSize(); + long startNum = (current - 1) * pageSize; + param.setStartNum(startNum); + param.setPageSize(pageSize); +// request.setStatuses(param.getStatuses()); + request.setKeyword(param.getUserName()); + + request.setSiSchemeId(param.getSiSchemeId()); + request.setFundSchemeId(param.getFundSchemeId()); + request.setOtherSchemeId(param.getOtherSchemeId()); + + request.setPageSize(param.getPageSize()); + request.setCurrent(param.getCurrent()); + + request.setJobNum(param.getJobNum()); + + request.setOrderRule(param.getOrderRule()); + + request.setRunStatuses(param.getRunStatuses()); + + request.setTaxAgentId(param.getTaxAgentId()); + + request.setExtWelArchiveList(param.isExtWelArchiveList()); + + apidatas = listPageEmployeePOS(request, operateId); + + return apidatas; + } + + /** + * 获取员工的基本信息 + *

+ * 此处主要是一个公共接口，有多处引用。我们薪资系统只保存员工id（employeeId）， + * 但是页面上需要展示员工的更多信息（姓名，部门，状态。。。）， + * 所以这里主要是用于接收联表数据的一个接口 + * + * @param param 高级搜索条件，用于过滤数据 + * @param operateId 操作员id + * @return list + */ + public Map listPageEmployeePOS(InsuranceArchivesListParam param, long operateId) { + //是否分权 + Boolean needAuth = param.getNeedAuth(); + StopWatch sw = new StopWatch(); + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + Map datas = new HashMap<>(16); + try { + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + List page = new ArrayList<>(); + PageInfo pageInfo = new PageInfo<>(InsuranceArchivesEmployeePO.class); + //获取福利档案列表数据 + if (needAuth) { + Collection taxAgentEmployeeIds = param.getTaxAgentEmployeeIds(); + Collection taxAgentIds = param.getTaxAgentIds(); + log.info("从数据库获取档案列表数据开始"); + sw.start("获取福利档案列表数据"); + if (param.isExtWelArchiveList()) { + page = socialSchemeMapper.queryExtEmployeeList(param); + } else { + page = socialSchemeMapper.queryEmployeeList(param); + } + sw.stop(); + log.info("从数据库获取档案列表数据完成！"); + page = page.stream().filter(f -> +// taxAgentEmployeeIds.contains(f.getEmployeeId())|| + taxAgentIds.contains(f.getPaymentOrganization()) + ).collect(Collectors.toList()); + // 填充总数和当页数据 + // 分页参数 + pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), InsuranceArchivesEmployeePO.class); + pageInfo.setTotal(page.size()); + pageInfo.setList(SalaryPageUtil.subList(pageInfo.getPageNum(), pageInfo.getPageSize(), page)); + } else { + log.info("从数据库获取档案列表数据开始"); + sw.start("获取档案列表数据"); + if (param.isExtWelArchiveList()) { + page = socialSchemeMapper.queryExtEmployeeList(param); + } else { + page = socialSchemeMapper.queryEmployeeList(param); + } + sw.stop(); + log.info("从数据库获取档案列表数据完成！"); + pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), + page, InsuranceArchivesEmployeePO.class); + } + List> records = null; + log.info("buildTableData方法处理福利档案列表数据开始"); + sw.start("buildTableData方法处理福利档案列表数据"); + if (param.getExportData() != null && param.getExportData()) { + records = buildTableData(pageInfo.getList(), true); + } else { + records = buildTableData(pageInfo.getList(), false); + } + sw.stop(); + log.info("buildTableData方法处理福利档案列表数据完成！"); + + log.info("buildWeaTableColumns方法处理福利档案列表数据开始"); + sw.start("buildWeaTableColumns方法处理福利档案列表数据"); + List columns = buildWeaTableColumns(pageInfo.getList()); + sw.stop(); + log.info("buildWeaTableColumns方法处理福利档案列表数据完成！"); + WeaTable table = new WeaTable(); + table.setColumns(columns); + //设置check是否可用 + List checkboxpopedomList = new ArrayList<>(); + WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom(); + checkboxpopedom.setPopedompara("column:system_type"); + checkboxpopedom.setShowmethod("com.engine.salary.transmethod.TaxRateTransMethod.getCheckBoxPopedom"); + checkboxpopedomList.add(checkboxpopedom); + table.setCheckboxList(checkboxpopedomList); + table.setCheckboxpopedom(null); + + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + + datas.put("pageInfo", pageInfo); + datas.put("datas", records); + datas.put("columns", columns); + datas.put("dataKey", result.getResultMap()); + + log.info("各操作计时 {}", sw.prettyPrint()); + return datas; + + } finally { + sqlSession.close(); + } + } + + /** + * 高级搜索 + * + * @return + */ + public Map getSearchCondition() { + + List userStatusOptions = Arrays.stream(UserStatusEnum.values()).map(e -> new SearchConditionOption(String.valueOf(e.getValue()), e.getDefaultLabel())).collect(Collectors.toList()); + List list = new SISchemeBiz().listAll(); + + List schemeOption = list.stream().filter(item -> Objects.equals(item.getWelfareType(), WelfareTypeEnum.SOCIAL_SECURITY.getValue())) + .collect(Collectors.toList()) + .stream().map(item -> new SearchConditionOption(item.getId().toString(), item.getSchemeName())).collect(Collectors.toList()); + + List fundOption = list.stream().filter(item -> Objects.equals(item.getWelfareType(), WelfareTypeEnum.ACCUMULATION_FUND.getValue())) + .collect(Collectors.toList()) + .stream().map(item -> new SearchConditionOption(item.getId().toString(), item.getSchemeName())).collect(Collectors.toList()); + + List otherOption = list.stream().filter(item -> Objects.equals(item.getWelfareType(), WelfareTypeEnum.OTHER.getValue())) + .collect(Collectors.toList()) + .stream().map(item -> new SearchConditionOption(item.getId().toString(), item.getSchemeName())).collect(Collectors.toList()); + + List> taxAgentList = getTaxAgentWrapper(user).selectListAsAdmin(); + List taxAgentOption = taxAgentList.stream().map(item -> new SearchConditionOption(item.get("id").toString(), item.get("content").toString())).collect(Collectors.toList()); + + + Map apidatas = new HashMap(); + ConditionFactory conditionFactory = new ConditionFactory(user); + + //条件组 + List addGroups = new ArrayList(); + + List conditionItems = new ArrayList(); + + //文本输入框 + SearchConditionItem username = conditionFactory.createCondition(ConditionType.INPUT, 25034, "username"); + username.setInputType("input"); + username.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + username.setFieldcol(16); //条件输入框所占宽度，默认值18 + username.setLabelcol(8); + username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + username.setLabel(SalaryI18nUtil.getI18nLabel(0,"姓名")); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(username); + + //文本输入框 + SearchConditionItem jobNum = conditionFactory.createCondition(ConditionType.INPUT, 25034, "jobNum"); + jobNum.setInputType("input"); + jobNum.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + jobNum.setFieldcol(16); //条件输入框所占宽度，默认值18 + jobNum.setLabelcol(8); + jobNum.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + jobNum.setLabel(SalaryI18nUtil.getI18nLabel(0,"工号")); //设置文本值 这个将覆盖多语言标签的值 + conditionItems.add(jobNum); + + + SearchConditionItem departmentIds = conditionFactory.createCondition(ConditionType.BROWSER, 502329, "departmentIdsStr", "57"); + departmentIds.setColSpan(2); + departmentIds.setFieldcol(16); + departmentIds.setLabelcol(8); + departmentIds.setLabel(SalaryI18nUtil.getI18nLabel(0,"部门")); + conditionItems.add(departmentIds); + + + SearchConditionItem statuses = conditionFactory.createCondition(ConditionType.SELECT, 502327, "statusesStr"); + statuses.setInputType("select"); + statuses.setMultiple(true); + statuses.setOptions(userStatusOptions); + statuses.setColSpan(2); + statuses.setFieldcol(16); + statuses.setLabelcol(8); + statuses.setIsQuickSearch(true); + statuses.setLabel(SalaryI18nUtil.getI18nLabel(0,"状态")); + conditionItems.add(statuses); + + + SearchConditionItem positions = conditionFactory.createCondition(ConditionType.BROWSER, 502327, "positionsStr", "278"); + positions.setInputType("browser"); + positions.setColSpan(2); + positions.setFieldcol(16); + positions.setLabelcol(8); + positions.setIsQuickSearch(true); + positions.setLabel(SalaryI18nUtil.getI18nLabel(0,"岗位")); + conditionItems.add(positions); + + SearchConditionItem subcompanyIds = conditionFactory.createCondition(ConditionType.BROWSER, 502327, "subcompanyIdsStr", "194"); + subcompanyIds.setInputType("browser"); + subcompanyIds.setColSpan(2); + subcompanyIds.setFieldcol(16); + subcompanyIds.setLabelcol(8); + subcompanyIds.setIsQuickSearch(true); + subcompanyIds.setLabel(SalaryI18nUtil.getI18nLabel(0,"分部")); + conditionItems.add(subcompanyIds); + +// SearchConditionItem hireDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{"hireDate", "hireDate"}); +// hireDate.setInputType("timepicker"); +// hireDate.setColSpan(2); +// hireDate.setFieldcol(16); +// hireDate.setViewAttr(8); +// hireDate.setFormat("yyyy-MM-dd"); +// hireDate.setLabel(SalaryI18nUtil.getI18nLabel(0,"入职日期")); +// conditionItems.add(hireDate); +// +// +// SearchConditionItem dimissionDate = conditionFactory.createCondition(ConditionType.TIMEPICKER,502327,new String[]{"dimissionDate", "dimissionDate"}); +// dimissionDate.setInputType("timepicker"); +// dimissionDate.setColSpan(2); +// dimissionDate.setFieldcol(16); +// dimissionDate.setViewAttr(8); +// dimissionDate.setFormat("yyyy-MM-dd"); +// dimissionDate.setLabel(SalaryI18nUtil.getI18nLabel(0,"离职日期")); +// conditionItems.add(dimissionDate); + + + SearchConditionItem siSchemeId = conditionFactory.createCondition(ConditionType.SELECT, 502327, "siSchemeId"); + siSchemeId.setInputType("select"); + siSchemeId.setOptions(schemeOption); + siSchemeId.setColSpan(2); + siSchemeId.setFieldcol(16); + siSchemeId.setLabelcol(8); + siSchemeId.setIsQuickSearch(true); + siSchemeId.setLabel(SalaryI18nUtil.getI18nLabel(0,"社保方案")); + conditionItems.add(siSchemeId); + + + SearchConditionItem fundSchemeId = conditionFactory.createCondition(ConditionType.SELECT, 502327, "fundSchemeId"); + fundSchemeId.setInputType("select"); + fundSchemeId.setOptions(fundOption); + fundSchemeId.setColSpan(2); + fundSchemeId.setFieldcol(16); + fundSchemeId.setLabelcol(8); + fundSchemeId.setIsQuickSearch(true); + fundSchemeId.setLabel(SalaryI18nUtil.getI18nLabel(0,"公积金方案")); + conditionItems.add(fundSchemeId); + + SearchConditionItem otherSchemeId = conditionFactory.createCondition(ConditionType.SELECT, 502327, "otherSchemeId"); + otherSchemeId.setInputType("select"); + otherSchemeId.setOptions(otherOption); + otherSchemeId.setColSpan(2); + otherSchemeId.setFieldcol(16); + otherSchemeId.setLabelcol(8); + otherSchemeId.setIsQuickSearch(true); + otherSchemeId.setLabel(SalaryI18nUtil.getI18nLabel(0,"其他福利方案")); + conditionItems.add(otherSchemeId); + + SearchConditionItem taxAgentId = conditionFactory.createCondition(ConditionType.SELECT, 502327, "taxAgentId"); + taxAgentId.setInputType("select"); + taxAgentId.setOptions(taxAgentOption); + taxAgentId.setColSpan(2); + taxAgentId.setFieldcol(16); + taxAgentId.setLabelcol(8); + taxAgentId.setIsQuickSearch(true); + taxAgentId.setLabel(SalaryI18nUtil.getI18nLabel(0,"个税扣缴义务人")); + conditionItems.add(taxAgentId); + + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(0,"常用条件"), true, conditionItems)); + apidatas.put("condition", addGroups); + return apidatas; + } + + @Override + public List getSocialByEmployeeIds(List employeeIds) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + List> partition = Lists.partition(employeeIds, 1000); + List allList = new ArrayList<>(); + for (List longs : partition) { + List socialList = socialSchemeMapper.getSocialByEmployeeId(longs); + allList.addAll(socialList); + } + return allList; + } finally { + sqlSession.close(); + } + } + + @Override + public List getFundByEmployeeIds(List employeeIds) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); + List> partition = Lists.partition(employeeIds, 1000); + List allList = new ArrayList<>(); + for (List longs : partition) { + List fundList = fundSchemeMapper.getFundByEmployeeId(longs); + allList.addAll(fundList); + } + return allList; + } finally { + sqlSession.close(); + } + } + + @Override + public List getOtherByEmployeeIds(List employeeIds) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); + List> partition = Lists.partition(employeeIds, 1000); + List allList = new ArrayList<>(); + for (List longs : partition) { + List otherList = otherSchemeMapper.getOtherByEmployeeId(longs); + allList.addAll(otherList); + } + return allList; + } finally { + sqlSession.close(); + } + } + + /** + * 组装员工的社保，公积金，其他福利数据 + * + * @param ids 员工id集合 + * @return map + */ + @Override + public Map buildBatchAccount(List ids, Long paymentOrganization) { + if (org.apache.commons.collections.CollectionUtils.isEmpty(ids)) { + return new HashMap<>(); + } + //设置获取社保/公积金/其他福利档案方法的入参 + List insuranceArchivesEmployeePOS = new ArrayList<>(); + for (Long employeeId : ids) { + insuranceArchivesEmployeePOS.add(InsuranceArchivesEmployeePO.builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrganization) + .build()); + } + + Map result = new HashMap<>(); + Map socialMap = new HashMap<>(); + Map funMap = new HashMap<>(); + Map otherMap = new HashMap<>(); + List socialPOS = encryptUtil.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesSocialSchemePO.class); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(socialPOS)) { + socialMap = socialPOS.stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getEmployeeId, Function.identity())); + } + List fundPOS = encryptUtil.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesFundSchemePO.class); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(fundPOS)) { + funMap = fundPOS.stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getEmployeeId, Function.identity())); + } + List otherPOS = this.getOtherByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS); + encryptUtil.decryptList(otherPOS, InsuranceArchivesOtherSchemePO.class); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(otherPOS)) { + otherMap = otherPOS.stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getEmployeeId, Function.identity())); + } + for (Long id : ids) { + InsuranceArchivesAccountPO po = new InsuranceArchivesAccountPO(); + po.setSocial(socialMap.get(id)); + po.setFund(funMap.get(id)); + po.setOther(otherMap.get(id)); + result.put(id, po); + } + return result; + } + + @Override + public List dealSocialBaseAdjustInfoList(List adjustList, Long creator) { + List adjustHistoryList = new ArrayList<>(); + if (adjustList.size() > 0) { + //遍历待更新的福利档案数据，对每组档案生成基数调整记录（基数单元未变化则忽略） + for (InsuranceArchivesSocialSchemePO po : adjustList) { + List oldBaseInfoList = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .paymentOrganization(po.getPaymentOrganization()).employeeId(po.getEmployeeId()).build()); + + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(po.getSocialSchemeId()) + .adjustAfterBaseJson(po.getSocialPaymentBaseString()) + .adjustAfterComBaseJson(po.getSocialPaymentComBaseString()) + .welfareType(po.getWelfareType()) + .employeeId(po.getEmployeeId()) + .paymentOrganization(po.getPaymentOrganization()) + .build(); + if (oldBaseInfoList.size() == 1) { + //新增调整记录，变更 + InsuranceArchivesSocialSchemePO oldBaseInfo = oldBaseInfoList.get(0); + encryptUtil.decrypt(oldBaseInfo, InsuranceArchivesSocialSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldBaseInfo.getSocialPaymentBaseString()); + adjustInfo.setAdjustBeforeComBaseJson(oldBaseInfo.getSocialPaymentComBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldBaseInfo.getSocialSchemeId()); + } else if (oldBaseInfoList.size() > 1) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保档案存在冗余数据！")); + } + adjustHistoryList.addAll(createAdjustInfo(adjustInfo, creator)); + } + } + return adjustHistoryList; + + } + + @Override + public List dealFundBaseAdjustInfoList(List adjustList, Long creator) { + List adjustHistoryList = new ArrayList<>(); + if (adjustList.size() > 0) { + //遍历待更新的福利档案数据，对每组档案生成基数调整记录（基数单元未变化则忽略） + for (InsuranceArchivesFundSchemePO po : adjustList) { + List oldBaseInfoList = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .paymentOrganization(po.getPaymentOrganization()).employeeId(po.getEmployeeId()).build()); + + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(po.getFundSchemeId()) + .adjustAfterBaseJson(po.getFundPaymentBaseString()) + .adjustAfterComBaseJson(po.getFundPaymentComBaseString()) + .welfareType(po.getWelfareType()) + .employeeId(po.getEmployeeId()) + .paymentOrganization(po.getPaymentOrganization()) + .build(); + if (oldBaseInfoList.size() == 1) { + //新增调整记录，变更 + InsuranceArchivesFundSchemePO oldBaseInfo = oldBaseInfoList.get(0); + encryptUtil.decrypt(oldBaseInfo, InsuranceArchivesFundSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldBaseInfo.getFundPaymentBaseString()); + adjustInfo.setAdjustBeforeComBaseJson(oldBaseInfo.getFundPaymentComBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldBaseInfo.getFundSchemeId()); + } else if (oldBaseInfoList.size() > 1) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金档案存在冗余数据！")); + } + adjustHistoryList.addAll(createAdjustInfo(adjustInfo, creator)); + } + } + return adjustHistoryList; + } + + @Override + public List dealOtherBaseAdjustInfoList(List adjustList, Long creator) { + List adjustHistoryList = new ArrayList<>(); + if (adjustList.size() > 0) { + //遍历待更新的福利档案数据，对每组档案生成基数调整记录（基数单元未变化则忽略） + for (InsuranceArchivesOtherSchemePO po : adjustList) { + List oldBaseInfoList = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .paymentOrganization(po.getPaymentOrganization()).employeeId(po.getEmployeeId()).build()); + + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(po.getOtherSchemeId()) + .adjustAfterBaseJson(po.getOtherPaymentBaseString()) + .adjustAfterComBaseJson(po.getOtherPaymentComBaseString()) + .welfareType(po.getWelfareType()) + .employeeId(po.getEmployeeId()) + .paymentOrganization(po.getPaymentOrganization()) + .build(); + if (oldBaseInfoList.size() == 1) { + //新增调整记录，变更 + InsuranceArchivesOtherSchemePO oldBaseInfo = oldBaseInfoList.get(0); + encryptUtil.decrypt(oldBaseInfo, InsuranceArchivesOtherSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldBaseInfo.getOtherPaymentBaseString()); + adjustInfo.setAdjustBeforeComBaseJson(oldBaseInfo.getOtherPaymentComBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldBaseInfo.getOtherSchemeId()); + } else if (oldBaseInfoList.size() > 1) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利档案存在冗余数据！")); + } + adjustHistoryList.addAll(createAdjustInfo(adjustInfo, creator)); + } + } + return adjustHistoryList; + } + + /** + * 获取没有设置社保、公积金最后缴纳月的档案 + * @param employeeIds + * @return + */ + @Override + public List listEndDateIsNull(List employeeIds) { + if (org.apache.commons.collections.CollectionUtils.isEmpty(employeeIds)) { + return Collections.emptyList(); + } + return getInsuranceBaseInfoMapper().listEndDateIsNull(employeeIds); + } + /*****以上代码为SIArchivesBiz中方法逻辑迁移，旨在减少Biz类的使用*****/ } diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index 93c929e46..f3432aa33 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.TypeReference; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; import com.engine.salary.entity.siaccount.param.InsuranceAccountDetailParam; @@ -25,10 +24,7 @@ import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; -import com.engine.salary.service.SIAccountService; -import com.engine.salary.service.SIExportService; -import com.engine.salary.service.SISchemeService; -import com.engine.salary.service.TaxAgentService; +import com.engine.salary.service.*; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.enums.OpenEnum; @@ -69,7 +65,7 @@ public class SIExportServiceImpl extends Service implements SIExportService { // private SIAccountBiz siAccountBiz = new SIAccountBiz(); - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); private SISchemeService getSISchemeService(User user) { return ServiceUtil.getService(SISchemeServiceImpl.class, user); @@ -107,6 +103,10 @@ public class SIExportServiceImpl extends Service implements SIExportService { return ServiceUtil.getService(SIAccountServiceImpl.class, user); } + public SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class, user); + } + @Override public XSSFWorkbook exportOverView(InsuranceExportParam queryParam) { List insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().selectList(queryParam.getBillMonth(), StringUtils.isBlank(queryParam.getPaymentOrganization()) ? null : Long.valueOf(queryParam.getPaymentOrganization())); @@ -253,7 +253,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { @Override public List> buildCommonRecords(List list) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); List> result = new ArrayList<>(); List paymentList = getTaxAgentMapper().listAll(); @@ -287,7 +288,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { if (welBaseDiffSign) { if (socialJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); socialJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "socialPerBase", v); @@ -298,7 +300,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { }); if (socialComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); socialComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "socialComBase", v); @@ -308,7 +311,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { } else { if (socialJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getSocialSchemeId()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getSocialSchemeId()); socialJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "socialBase", v); @@ -332,7 +336,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { if (welBaseDiffSign) { if (fundJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); fundJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "fundPerBase", v); @@ -343,7 +348,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { }); if (fundComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); fundComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "fundComBase", v); @@ -353,7 +359,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { } else { if (fundJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getFundSchemeId()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getFundSchemeId()); fundJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "fundBase", v); @@ -375,7 +382,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { if (welBaseDiffSign) { if (otherJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); otherJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "otherPerBase", v); @@ -386,7 +394,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { }); if (otherComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); otherComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "otherComBase", v); @@ -396,7 +405,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { } else { if (otherJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(item.getOtherSchemeId()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(item.getOtherSchemeId()); otherJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { record.put(k + "otherBase", v); @@ -731,7 +741,8 @@ public class SIExportServiceImpl extends Service implements SIExportService { } private Map> buildPaymentTitle(List pos, Map categoryIdNameMap) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); Set socailIds = new HashSet<>(); Set fundIds = new HashSet<>(); Set otherIds = new HashSet<>(); diff --git a/src/com/engine/salary/service/impl/SIImportServiceImpl.java b/src/com/engine/salary/service/impl/SIImportServiceImpl.java index c8b41704c..64623943d 100644 --- a/src/com/engine/salary/service/impl/SIImportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIImportServiceImpl.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.TypeReference; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.po.InsuranceArchivesEmployeePO; @@ -26,7 +25,6 @@ import com.engine.salary.service.SIImportService; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelComment; -import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -51,7 +49,7 @@ import java.util.stream.Collectors; public class SIImportServiceImpl extends Service implements SIImportService { private EncryptUtil encryptUtil = new EncryptUtil(); - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); public SIArchivesService getSIArchivesService(User user) { return ServiceUtil.getService(SIArchivesServiceImpl.class,user); @@ -195,7 +193,8 @@ public class SIImportServiceImpl extends Service implements SIImportService { * @return */ public List buildHeader() { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); List result = new ArrayList<>(); result.add(SalaryI18nUtil.getI18nLabel( 85429, "姓名")); result.add(SalaryI18nUtil.getI18nLabel( 86184, "个税扣缴义务人")); @@ -294,19 +293,22 @@ public class SIImportServiceImpl extends Service implements SIImportService { } List employeeIds = insuranceArchivesEmployeePOS.stream().map(InsuranceArchivesEmployeePO::getEmployeeId).collect(Collectors.toList()); Map socialSchemePOMap = new HashMap<>(); - List socialSchemePOList = siArchivesBiz.getSocialByEmployeeIds(employeeIds); +// List socialSchemePOList = siArchivesBiz.getSocialByEmployeeIds(employeeIds); + List socialSchemePOList = getSIArchivesService(user).getSocialByEmployeeIds(employeeIds); encryptUtil.decryptList(socialSchemePOList, InsuranceArchivesSocialSchemePO.class); if (CollectionUtils.isNotEmpty(socialSchemePOList)) { socialSchemePOMap = socialSchemePOList.stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getEmployeeId, Function.identity())); } - List fundSchemePOList = siArchivesBiz.getFundByEmployeeIds(employeeIds); +// List fundSchemePOList = siArchivesBiz.getFundByEmployeeIds(employeeIds); + List fundSchemePOList = getSIArchivesService(user).getFundByEmployeeIds(employeeIds); encryptUtil.encryptList(fundSchemePOList, InsuranceArchivesFundSchemePO.class); Map fundSchemePOMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(fundSchemePOList)) { fundSchemePOMap = fundSchemePOList.stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getEmployeeId, Function.identity())); } Map otherSchemePOMap = new HashMap<>(); - List otherSchemePOList = siArchivesBiz.getOtherByEmployeeIds(employeeIds); +// List otherSchemePOList = siArchivesBiz.getOtherByEmployeeIds(employeeIds); + List otherSchemePOList = getSIArchivesService(user).getOtherByEmployeeIds(employeeIds); encryptUtil.decryptList(otherSchemePOList, InsuranceArchivesOtherSchemePO.class); if (CollectionUtils.isNotEmpty(otherSchemePOList)) { otherSchemePOMap = otherSchemePOList.stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getEmployeeId, Function.identity())); diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 19a670559..3ab971917 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -6,11 +6,9 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.biz.SISchemeBiz; import com.engine.salary.cmd.sischeme.*; import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.encrypt.AESEncryptUtil; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; @@ -51,7 +49,6 @@ import com.engine.salary.util.*; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; -import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -129,7 +126,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { return ServiceUtil.getService(SIImportServiceImpl.class, user); } - private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); +// private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); private SISchemeBiz siSchemeBiz = new SISchemeBiz(); private SalaryEmployeeService getSalaryEmployeeService(User user) { @@ -152,6 +149,10 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { return ServiceUtil.getService(TaxAgentManageRangeServiceImpl.class, user); } + public SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class,user); + } + @Override public Map getForm(Map params) { return commandExecutor.execute(new SISchemeGetFormCmd(params, user)); @@ -264,7 +265,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { @Override public List> buildTableData(List insuranceArchivesEmployeePOS) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); List> records = new ArrayList<>(); List taxAgentPOS = getTaxAgentMapper().listAll(); Map longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId); @@ -282,9 +284,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { end = employeeIds.size(); } List ids = employeeIds.subList(i, end); - socialList.addAll(encryptUtil.decryptList(siArchivesBiz.getSocialByEmployeeIds(ids), InsuranceArchivesSocialSchemePO.class)); - fundList.addAll(encryptUtil.decryptList(siArchivesBiz.getFundByEmployeeIds(ids), InsuranceArchivesFundSchemePO.class)); - otherList.addAll(encryptUtil.decryptList(siArchivesBiz.getOtherByEmployeeIds(ids), InsuranceArchivesOtherSchemePO.class)); + socialList.addAll(encryptUtil.decryptList(getSIArchivesService(user).getSocialByEmployeeIds(ids), InsuranceArchivesSocialSchemePO.class)); + fundList.addAll(encryptUtil.decryptList(getSIArchivesService(user).getFundByEmployeeIds(ids), InsuranceArchivesFundSchemePO.class)); + otherList.addAll(encryptUtil.decryptList(getSIArchivesService(user).getOtherByEmployeeIds(ids), InsuranceArchivesOtherSchemePO.class)); } Map socialSchemePOMap = SalaryEntityUtil.convert2Map(socialList, k -> k.getPaymentOrganization() + "-" + k.getEmployeeId()); Map fundSchemePOMap = SalaryEntityUtil.convert2Map(fundList, k -> k.getPaymentOrganization() + "-" + k.getEmployeeId()); @@ -311,7 +313,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (welBaseDiffSign) { if (socialJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); socialJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { map.put(k + "per", v); @@ -322,7 +325,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { }); if (socialComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); socialComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { map.put(k + "com", v); @@ -352,7 +356,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (welBaseDiffSign) { if (fundJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); fundJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { map.put(k + "per", v); @@ -363,7 +368,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { }); if (fundComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); fundComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { map.put(k + "com", v); @@ -393,7 +399,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (welBaseDiffSign) { if (otherJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); otherJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { map.put(k + "per", v); @@ -404,7 +411,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { }); if (otherComJson != null) { //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = siArchivesBiz.payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); +// List insuranceIdList = siArchivesBiz.payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + List insuranceIdList = getSIArchivesService(user).payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); otherComJson.forEach((k, v) -> { if (insuranceIdList.contains(Long.valueOf(k))) { map.put(k + "com", v); @@ -587,7 +595,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { public Map> buildColumnTitle(List insuranceArchivesEmployeePOS, Long employeeId) { - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); Map> result = new HashMap<>(); Set socialSet = new HashSet<>(); @@ -599,7 +608,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { Set otherComSet = new HashSet<>(); insuranceArchivesEmployeePOS.forEach(item -> { - List socialByEmployeeId = siArchivesBiz.getSocialByEmployeeIds(new ArrayList() {{ + List socialByEmployeeId = getSIArchivesService(user).getSocialByEmployeeIds(new ArrayList() {{ add(item.getEmployeeId()); }}); encryptUtil.decryptList(socialByEmployeeId, InsuranceArchivesSocialSchemePO.class); @@ -609,7 +618,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } InsuranceArchivesFundSchemePO fundItem = null; - List fundByEmployeeId = siArchivesBiz.getFundByEmployeeIds(new ArrayList() {{ + List fundByEmployeeId = getSIArchivesService(user).getFundByEmployeeIds(new ArrayList() {{ add(item.getEmployeeId()); }}); encryptUtil.decryptList(fundByEmployeeId, InsuranceArchivesFundSchemePO.class); @@ -619,7 +628,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } InsuranceArchivesOtherSchemePO otherItem = null; - List otherByEmployeeId = siArchivesBiz.getOtherByEmployeeIds(new ArrayList() {{ + List otherByEmployeeId = getSIArchivesService(user).getOtherByEmployeeIds(new ArrayList() {{ add(item.getEmployeeId()); }}); encryptUtil.decryptList(otherByEmployeeId, InsuranceArchivesOtherSchemePO.class); @@ -809,6 +818,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { /** * 导入的数据插入到数据库中 */ + @Override public Map batchImportEbatch(SIArchiveImportParam param) { ValidUtil.doValidator(param); param.setProcess(false); @@ -1229,7 +1239,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesOtherSchemePO = buildOtherPO(employeeId, welfareMap, singleAccount, schemeNameIdMap, paymentNameIdMap, creator); } /**************校验申报基数**************/ - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); if (welBaseDiffSign) { for (Map.Entry entry : welfareMap.entrySet()) { String keyPerName = entry.getValue() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"); @@ -1276,19 +1287,19 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesAccountPO.setOther(insuranceArchivesOtherSchemePO); insuranceArchivesAccountPO.setBaseInfo(insuranceArchivesBaseInfoPO); //校验福利基数是否符合上下限要求， - Boolean socialCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + Boolean socialCheckBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - Boolean fundCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + Boolean fundCheckBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - Boolean otherCheckBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + Boolean otherCheckBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); Boolean socialCheckComBase = true; Boolean fundCheckComBase = true; Boolean otherCheckComBase = true; if (welBaseDiffSign) { - socialCheckComBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); - fundCheckComBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); - otherCheckComBase = siArchivesBiz.checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + socialCheckComBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundCheckComBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherCheckComBase = getSIArchivesService(user).checkWelBaseLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); } if (socialCheckBase && fundCheckBase && otherCheckBase && socialCheckComBase && fundCheckComBase && otherCheckComBase) { insuranceArchivesAccountPOS.add(insuranceArchivesAccountPO); @@ -1313,18 +1324,18 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } else if (!isError) { //校验福利基数是否符合上下限要求，不符合上下限的基数调整为上限 /下限 - String newSocialPaymentBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - String newFundPaymentBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - String newOtherPaymentBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + String newSocialPaymentBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + String newFundPaymentBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + String newOtherPaymentBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue()); insuranceArchivesSocialSchemePO.setSocialPaymentBaseString(newSocialPaymentBaseString); insuranceArchivesFundSchemePO.setFundPaymentBaseString(newFundPaymentBaseString); insuranceArchivesOtherSchemePO.setOtherPaymentBaseString(newOtherPaymentBaseString); if (welBaseDiffSign) { - String newSocialPaymentComBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); - String newFundPaymentComBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); - String newOtherPaymentComBaseString = siArchivesBiz.checkAndBuildWelBaseWithLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + String newSocialPaymentComBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesSocialSchemePO.getSocialSchemeId(), insuranceArchivesSocialSchemePO.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + String newFundPaymentComBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesFundSchemePO.getFundSchemeId(), insuranceArchivesFundSchemePO.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); + String newOtherPaymentComBaseString = getSIArchivesService(user).checkAndBuildWelBaseWithLimit(insuranceArchivesOtherSchemePO.getOtherSchemeId(), insuranceArchivesOtherSchemePO.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue()); insuranceArchivesSocialSchemePO.setSocialPaymentComBaseString(newSocialPaymentComBaseString); insuranceArchivesFundSchemePO.setFundPaymentComBaseString(newFundPaymentComBaseString); @@ -1413,7 +1424,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesSocialSchemePO.getSocialSchemeId()); encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); HashMap socialPaymentBase = new HashMap<>(); @@ -1525,7 +1537,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesFundSchemePO.getFundSchemeId()); encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); HashMap fundPaymentBase = new HashMap<>(); @@ -1627,7 +1640,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceArchivesOtherSchemePO.setEmployeeId(employeeId); List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(insuranceArchivesOtherSchemePO.getOtherSchemeId()); encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); +// boolean welBaseDiffSign = siArchivesBiz.isDiffWelBase(); + boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase(); if (CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS)) { List insuranceIds = insuranceSchemeDetailPOS.stream().map(InsuranceSchemeDetailPO::getInsuranceId).collect(Collectors.toList()); HashMap otherPaymentBase = new HashMap<>(); @@ -1705,7 +1719,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); //生成福利档案基数调整历史记录 - List adjustSocialHistoryPOList = siArchivesBiz.dealSocialBaseAdjustInfoList(socialSchemePOS, (long) user.getUID()); +// List adjustSocialHistoryPOList = siArchivesBiz.dealSocialBaseAdjustInfoList(socialSchemePOS, (long) user.getUID()); + List adjustSocialHistoryPOList = getSIArchivesService(user).dealSocialBaseAdjustInfoList(socialSchemePOS, (long) user.getUID()); //根据人员id和个税扣缴义务人id删除对应旧档案 socialSchemePOS.forEach(getSocialSchemeMapper()::deleteByEmployeeIdAndPayOrg); @@ -1716,7 +1731,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { partition.forEach(getSocialSchemeMapper()::batchSave); //新建福利档案基数调整历史记录 - siArchivesBiz.batchInsertAdjustHistory(adjustSocialHistoryPOList, user.getUID()); +// siArchivesBiz.batchInsertAdjustHistory(adjustSocialHistoryPOList, user.getUID()); + getSIArchivesService(user).batchInsertAdjustHistory(adjustSocialHistoryPOList); } //导入公积金档案 List fundSchemePOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getFund).collect(Collectors.toList()); @@ -1727,7 +1743,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); //生成福利档案基数调整历史记录 - List adjustFundHistoryPOList = siArchivesBiz.dealFundBaseAdjustInfoList(fundSchemePOS, (long) user.getUID()); +// List adjustFundHistoryPOList = siArchivesBiz.dealFundBaseAdjustInfoList(fundSchemePOS, (long) user.getUID()); + List adjustFundHistoryPOList = getSIArchivesService(user).dealFundBaseAdjustInfoList(fundSchemePOS, (long) user.getUID()); //根据人员id和个税扣缴义务人id删除对应档案 fundSchemePOS.forEach(getFundSchemeMapper()::deleteByEmployeeIdAndPayOrg); //新建新档案 @@ -1735,7 +1752,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List> partition = Lists.partition(insuranceArchivesFundSchemePOS, 100); partition.forEach(getFundSchemeMapper()::batchSave); //新建福利档案基数调整历史记录 - siArchivesBiz.batchInsertAdjustHistory(adjustFundHistoryPOList, user.getUID()); +// siArchivesBiz.batchInsertAdjustHistory(adjustFundHistoryPOList, user.getUID()); + getSIArchivesService(user).batchInsertAdjustHistory(adjustFundHistoryPOList); } //导入其他福利档案 List otherSchemePOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getOther).collect(Collectors.toList()); @@ -1746,7 +1764,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); //生成福利档案基数调整历史记录 - List adjustOtherHistoryPOList = siArchivesBiz.dealOtherBaseAdjustInfoList(otherSchemePOS, (long) user.getUID()); +// List adjustOtherHistoryPOList = siArchivesBiz.dealOtherBaseAdjustInfoList(otherSchemePOS, (long) user.getUID()); + List adjustOtherHistoryPOList = getSIArchivesService(user).dealOtherBaseAdjustInfoList(otherSchemePOS, (long) user.getUID()); //根据人员id和个税扣缴义务人id删除对应档案 otherSchemePOS.forEach(getOtherSchemeMapper()::deleteByEmployeeIdAndPayOrg); @@ -1755,7 +1774,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { List> partition = Lists.partition(insuranceArchivesOtherSchemePOS, 100); partition.forEach(getOtherSchemeMapper()::batchSave); //新建福利档案基数调整历史记录 - siArchivesBiz.batchInsertAdjustHistory(adjustOtherHistoryPOList, user.getUID()); +// siArchivesBiz.batchInsertAdjustHistory(adjustOtherHistoryPOList, user.getUID()); + getSIArchivesService(user).batchInsertAdjustHistory(adjustOtherHistoryPOList); } //导入福利档案基础信息 List baseInfoPOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getBaseInfo).collect(Collectors.toList()); @@ -1801,6 +1821,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { * * @param param 是否导出带档案数据的模板 */ + @Override public XSSFWorkbook exportTemplate(InsuranceArchivesListParam param) { return getSIImportService().exportTemplate(param); diff --git a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java index b62f8ce6d..0505d7670 100644 --- a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java +++ b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java @@ -1,15 +1,16 @@ package com.engine.salary.timer; import com.engine.common.util.ServiceUtil; -import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.biz.SalaryArchiveBiz; import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; import com.engine.salary.mapper.siarchives.FundSchemeMapper; import com.engine.salary.mapper.siarchives.OtherSchemeMapper; import com.engine.salary.mapper.siarchives.SocialSchemeMapper; +import com.engine.salary.service.SIArchivesService; import com.engine.salary.service.SalaryArchiveService; import com.engine.salary.service.SalaryEmployeeService; +import com.engine.salary.service.impl.SIArchivesServiceImpl; import com.engine.salary.service.impl.SalaryArchiveServiceImpl; import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; import com.engine.salary.util.SalaryDateUtil; @@ -54,6 +55,10 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { private String preMonth; + public SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class,user); + } + @Override public void execute() { User user = new User(); @@ -85,8 +90,8 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { } // 获取离职人员中没有设置最后缴纳月的社保福利档案 - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - List needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); +// List needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); + List needSyncList = getSIArchivesService(user).listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); // 设置社保、公积金最后缴纳月 for(InsuranceArchivesBaseInfoPO po : needSyncList){ String dismissDate = resignationMap.get(po.getEmployeeId()); From 306af482913d67dfd405e2795be9f0e04d64ba99 Mon Sep 17 00:00:00 2001 From: sy Date: Sun, 4 Feb 2024 10:11:10 +0800 Subject: [PATCH 087/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8CSICategoryBiz?= =?UTF-8?q?=E3=80=81SISchemeBiz=E6=96=B9=E6=B3=95=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=E5=AF=B9=E5=BA=94=E6=98=AF=E5=AE=9E=E7=8E=B0=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/SICategoryService.java | 6 + .../salary/service/SISchemeService.java | 3 + .../service/impl/SIAccountServiceImpl.java | 8 +- .../service/impl/SIArchivesServiceImpl.java | 30 +- .../service/impl/SICategoryServiceImpl.java | 241 +++++++- .../service/impl/SISchemeServiceImpl.java | 548 +++++++++++++++++- 6 files changed, 801 insertions(+), 35 deletions(-) diff --git a/src/com/engine/salary/service/SICategoryService.java b/src/com/engine/salary/service/SICategoryService.java index dfaa84349..b1c9b37f7 100644 --- a/src/com/engine/salary/service/SICategoryService.java +++ b/src/com/engine/salary/service/SICategoryService.java @@ -3,10 +3,12 @@ package com.engine.salary.service; import com.engine.salary.entity.sicategory.dto.ICategoryDTO; import com.engine.salary.entity.sicategory.dto.ICategoryFormDTO; import com.engine.salary.entity.sicategory.dto.ICategoryListDTO; +import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.util.page.PageInfo; +import java.util.List; import java.util.Map; /** @@ -65,4 +67,8 @@ public interface SICategoryService { Map updateCategoryNameAndPayScope(ICategoryFormDTO iCategoryFormDTO); Map deleteCustomCategory(ICategoryFormDTO iCategoryFormDTO); + + ICategoryPO getICategoryPOByID(Long id); + + List listByName(String insuranceName); } diff --git a/src/com/engine/salary/service/SISchemeService.java b/src/com/engine/salary/service/SISchemeService.java index 5e0b8d8de..e465d2740 100644 --- a/src/com/engine/salary/service/SISchemeService.java +++ b/src/com/engine/salary/service/SISchemeService.java @@ -8,6 +8,7 @@ import com.engine.salary.entity.sischeme.dto.InsuranceSchemeListDTO; import com.engine.salary.entity.sischeme.param.InsuranceSchemeDetailUpdateParam; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; +import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; import com.engine.salary.util.page.PageInfo; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -80,4 +81,6 @@ public interface SISchemeService { * @param schemeDetailList */ List updateSchemeDetail(List schemeDetailList); + + List listAll(); } diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 08b7fc624..f08af7c81 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -147,7 +147,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { return MapperProxyFactory.getProxy(TaxAgentMapper.class); } - SICategoryBiz siCategoryBiz = new SICategoryBiz(); +// SICategoryBiz siCategoryBiz = new SICategoryBiz(); private SalarySysConfMapper getSalarySysConfMapper() { return SqlProxyHandle.getProxy(SalarySysConfMapper.class); @@ -2027,7 +2027,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { String payScope = keyName.substring(keyName.length() - 2); //获取福利类型 Integer welfareType; - List categoryPOList = siCategoryBiz.listByName(entry.getKey().substring(0, keyName.length() - 2)); +// List categoryPOList = siCategoryBiz.listByName(entry.getKey().substring(0, keyName.length() - 2)); + List categoryPOList = getSICategoryService(user).listByName(entry.getKey().substring(0, keyName.length() - 2)); if (categoryPOList.size() == 1) { ICategoryPO iCategoryPO = categoryPOList.get(0); welfareType = iCategoryPO.getWelfareType(); @@ -3254,7 +3255,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { for (Map.Entry entry : toDealMap.entrySet()) { //获取福利项信息 - ICategoryPO iCategoryPO = siCategoryBiz.getByID(Long.valueOf(entry.getKey())); +// ICategoryPO iCategoryPO = siCategoryBiz.getByID(Long.valueOf(entry.getKey())); + ICategoryPO iCategoryPO = getSICategoryService(user).getICategoryPOByID(Long.valueOf(entry.getKey())); if (iCategoryPO != null) { String name = groupPrefix + iCategoryPO.getId().toString(); String label = iCategoryPO.getInsuranceName(); diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 29859d236..798eed713 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -16,8 +16,6 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SICategoryBiz; -import com.engine.salary.biz.SISchemeBiz; import com.engine.salary.cmd.siarchives.SIArchivesTipsCmd; import com.engine.salary.common.SalaryContext; import com.engine.salary.constant.SalaryDefaultTenantConstant; @@ -47,10 +45,7 @@ import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; -import com.engine.salary.service.SIArchivesService; -import com.engine.salary.service.SalaryEmployeeService; -import com.engine.salary.service.TaxAgentEmpChangeService; -import com.engine.salary.service.TaxAgentService; +import com.engine.salary.service.*; import com.engine.salary.sys.constant.SalarySysConstant; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; @@ -149,6 +144,14 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return ServiceUtil.getService(TaxAgentWrapper.class, user); } + public SICategoryService getSICategoryService(User user) { + return ServiceUtil.getService(SICategoryServiceImpl.class, user); + } + + private SISchemeService getSISchemeService(User user) { + return ServiceUtil.getService(SISchemeServiceImpl.class,user); + } + @Override public Map getTips(Map params) { return commandExecutor.execute(new SIArchivesTipsCmd(params, user)); @@ -2249,8 +2252,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return data; } - SISchemeBiz siSchemeBiz = new SISchemeBiz(); - List list = siSchemeBiz.listAll(); +// List list = siSchemeBiz.listAll(); + List list = getSISchemeService(user).listAll(); // 过滤可见性范围 list = filterList(list, taxAgentPOS); List selectItems = new ArrayList<>(); @@ -2671,9 +2674,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } } - SICategoryBiz siCategoryBiz = new SICategoryBiz(); list.forEach(insuranceSchemeDetail -> { - ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); +// ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); + ICategoryPO iCategoryPO = getSICategoryService(user).getICategoryPOByID(insuranceSchemeDetail.getInsuranceId()); if (iCategoryPO != null) { // inputItems.add(SalaryFormItemUtil.inputNumberItem(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()))); inputItems.add(SalaryFormItemUtil.inputNumberItemWithMaxAndMin(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()) @@ -2690,9 +2693,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } List list = queryListByPrimaryIdIsPayment(schemeId, welfareType).stream() .filter(f -> f.getPaymentScope().equals(PaymentScopeEnum.SCOPE_COMPANY.getValue())).collect(Collectors.toList()); - SICategoryBiz siCategoryBiz = new SICategoryBiz(); list.forEach(insuranceSchemeDetail -> { - ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); +// ICategoryPO iCategoryPO = siCategoryBiz.getByID(insuranceSchemeDetail.getInsuranceId()); + ICategoryPO iCategoryPO = getSICategoryService(user).getICategoryPOByID(insuranceSchemeDetail.getInsuranceId()); if (iCategoryPO != null) { // inputItems.add(SalaryFormItemUtil.inputNumberItem(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()))); inputItems.add(SalaryFormItemUtil.inputNumberItemWithMaxAndMin(user, "precision:2", 2, 12, 2, iCategoryPO.getInsuranceName(), String.valueOf(insuranceSchemeDetail.getInsuranceId()) @@ -3484,7 +3487,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService public Map getSearchCondition() { List userStatusOptions = Arrays.stream(UserStatusEnum.values()).map(e -> new SearchConditionOption(String.valueOf(e.getValue()), e.getDefaultLabel())).collect(Collectors.toList()); - List list = new SISchemeBiz().listAll(); +// List list = new SISchemeBiz().listAll(); + List list = getSISchemeService(user).listAll(); List schemeOption = list.stream().filter(item -> Objects.equals(item.getWelfareType(), WelfareTypeEnum.SOCIAL_SECURITY.getValue())) .collect(Collectors.toList()) diff --git a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java index 5cf300cf5..b610a2afb 100644 --- a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java @@ -1,19 +1,22 @@ package com.engine.salary.service.impl; +import com.api.browser.bean.SearchConditionItem; +import com.api.browser.bean.SearchConditionOption; +import com.api.browser.util.ConditionFactory; +import com.api.browser.util.ConditionType; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.cmd.sicategory.SICategoryGetFormCmd; -import com.engine.salary.cmd.sicategory.SICategoryInsertCmd; -import com.engine.salary.cmd.sicategory.SICategoryUpdateCmd; -import com.engine.salary.cmd.sicategory.SICategoryUpdateStatusByIdCmd; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; +import com.engine.salary.entity.sicategory.bo.ICategoryBO; import com.engine.salary.entity.sicategory.dto.ICategoryDTO; import com.engine.salary.entity.sicategory.dto.ICategoryFormDTO; import com.engine.salary.entity.sicategory.dto.ICategoryListDTO; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; +import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; import com.engine.salary.enums.sicategory.DataTypeEnum; +import com.engine.salary.enums.sicategory.IsPaymentEnum; import com.engine.salary.enums.sicategory.PaymentScopeEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -21,15 +24,19 @@ import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.service.RecordsBuildService; import com.engine.salary.service.SICategoryService; +import com.engine.salary.service.SISchemeService; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryEnumUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; +import com.mzlion.core.utils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.session.SqlSession; +import weaver.conn.mybatis.MyBatisFactory; import weaver.hrm.User; import java.util.*; @@ -57,24 +64,93 @@ public class SICategoryServiceImpl extends Service implements SICategoryService private EncryptUtil encryptUtil = new EncryptUtil(); + private SISchemeService getSISchemeService(User user) { + return ServiceUtil.getService(SISchemeServiceImpl.class,user); + } + @Override public Map getForm(Map params) { - return commandExecutor.execute(new SICategoryGetFormCmd(params,user)); +// return commandExecutor.execute(new SICategoryGetFormCmd(params,user)); + Map apidatas = new HashMap<>(16); + Long id = (Long) params.get("id"); +// ICategoryFormDTO form = siCategoryBiz.getForm(id); + ICategoryFormDTO form = getForm(id); + apidatas.put("form",form); + ConditionFactory conditionFactory = new ConditionFactory(user); + Map items = new HashMap<>(); + + SearchConditionItem input = conditionFactory.createCondition(ConditionType.INPUT,0, "insuranceName"); + input.setColSpan(2);//定义一行显示条件数，默认值为2,当值为1时标识该条件单独占一行 + input.setFieldcol(12); //条件输入框所占宽度，默认值18 + input.setViewAttr(3); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 + input.setLength(10); // 设置输入长度 + input.setLabel(SalaryI18nUtil.getI18nLabel(0,"福利名称")); //设置文本值 这个将覆盖多语言标签的值 + input.setRules("required"); //设置字段填入规则 + + items.put("insuranceName",input); + + SearchConditionItem radio = conditionFactory.createCondition(ConditionType.RADIO,0,"welfareType"); + List radioOptions = new ArrayList <>(); + radioOptions.add(new SearchConditionOption("SOCIAL_SECURITY",SalaryI18nUtil.getI18nLabel(0,"社保"),true)); + radioOptions.add(new SearchConditionOption("ACCUMULATION_FUND",SalaryI18nUtil.getI18nLabel(0,"公积金"))); + radioOptions.add(new SearchConditionOption("OTHER",SalaryI18nUtil.getI18nLabel(0,"企业年金及其他福利"))); + radio.setColSpan(2); + radio.setFieldcol(12); + radio.setLabelcol(6); + radio.setViewAttr(3); + radio.setIsQuickSearch(false); + radio.setOptions(radioOptions); + radio.setLabel(SalaryI18nUtil.getI18nLabel(0,"类型")); + radio.setRules("required"); + items.put("welfareType",radio); + + SearchConditionItem checkbox = conditionFactory.createCondition(ConditionType.CHECKBOX,0,"paymentScope"); + List checkOptions = new ArrayList <>(); + checkOptions.add(new SearchConditionOption("SCOPE_COMPANY",SalaryI18nUtil.getI18nLabel(0,"公司"))); + checkOptions.add(new SearchConditionOption("SCOPE_PERSON",SalaryI18nUtil.getI18nLabel(0,"个人"))); + checkbox.setColSpan(2); + checkbox.setFieldcol(12); + checkbox.setLabelcol(6); + checkbox.setViewAttr(3); + checkbox.setIsQuickSearch(false); + checkbox.setOptions(checkOptions); + checkbox.setLabel(SalaryI18nUtil.getI18nLabel(0,"缴纳对象")); + checkbox.setRules("required"); + items.put("paymentScope",checkbox); + + apidatas.put("item",items); + return apidatas; } @Override public Map insert(Map params) { - return commandExecutor.execute(new SICategoryInsertCmd(params,user)); +// return commandExecutor.execute(new SICategoryInsertCmd(params,user)); + Map apidatas = new HashMap<>(16); + ICategoryFormDTO iCategoryFormDTO = (ICategoryFormDTO)params.get("iCategoryFormDTO"); +// siCategoryBiz.save(iCategoryFormDTO,(long) user.getUID()); + save(iCategoryFormDTO,(long) user.getUID()); + return apidatas; } @Override public Map update(Map params) { - return commandExecutor.execute(new SICategoryUpdateCmd(params,user)); +// return commandExecutor.execute(new SICategoryUpdateCmd(params,user)); + Map apidatas = new HashMap(16); + ICategoryFormDTO iCategoryFormDTO = (ICategoryFormDTO) params.get("iCategoryFormDTO"); +// siCategoryBiz.update(iCategoryFormDTO, (long) user.getUID()); + update(iCategoryFormDTO); + return apidatas; } @Override public Map updateStatusById(Map params) { - return commandExecutor.execute(new SICategoryUpdateStatusByIdCmd(params,user)); +// return commandExecutor.execute(new SICategoryUpdateStatusByIdCmd(params,user)); + Map apidatas = new HashMap(16); + Long id = (Long) params.get("id"); + Integer isUse = (Integer) params.get("isUse"); +// siCategoryBiz.updateStatusById(id, isUse,(long) user.getUID()); + updateStatusById(id, isUse); + return apidatas; } @Override @@ -238,4 +314,153 @@ public class SICategoryServiceImpl extends Service implements SICategoryService List collect = paymentScopes.stream().map(scope -> PaymentScopeEnum.getDefaultLabelByValue(SalaryEntityUtil.string2Integer(scope))).collect(Collectors.toList()); return StringUtils.join(collect, ","); } + /*****以下代码为SICategoryBiz中逻辑迁移，旨在减少Biz类的使用*****/ + + /** + * 自定义福利表单 + * id == null ? 新建表单 ： 查看已有数据内容表单 + * @param id 自定义福利主键 + * @return 表单 + */ + public ICategoryFormDTO getForm(Long id) { + if (id != null) { + ICategoryPO iCategoryPO = getICategoryPOByID(id); + ICategoryFormDTO iCategoryFormDTO = new ICategoryFormDTO(); + if (Objects.isNull(iCategoryPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"数据不存在")); + } + BeanUtils.copyProperties(iCategoryPO,iCategoryFormDTO); + return iCategoryFormDTO; + } + + return ICategoryFormDTO.builder().welfareType(WelfareTypeEnum.SOCIAL_SECURITY).build(); + } + + /** + * 根据id获取 + * @param id + * @return + */ + @Override + public ICategoryPO getICategoryPOByID(Long id) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); + ICategoryPO iCategoryPO = iCategoryMapper.getById(id); + return iCategoryPO; + + } finally { + sqlSession.close(); + } + } + + /** + * 根据名称获取 + * @param insuranceName + * @return + */ + @Override + public List listByName(String insuranceName) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + + try{ + ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); + List iCategoryPOS = iCategoryMapper.listByName(insuranceName); + return iCategoryPOS; + + } finally { + sqlSession.close(); + } + } + + /** + * 保存 + * @param iCategoryFormDTO + * @param employeeId DataTypeEnum.SYSTEM.getValue() + */ + public void save(ICategoryFormDTO iCategoryFormDTO, long employeeId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); + iCategoryFormDTO.setInsuranceName(StringUtils.trim(iCategoryFormDTO.getInsuranceName())); + List iCategoryPOS = listByName(iCategoryFormDTO.getInsuranceName()); + if (CollectionUtils.isNotEmpty(iCategoryPOS)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利名称不允许重复")); + } + ICategoryPO iCategoryPO = ICategoryBO.convertToInsuranceCategoryPO(iCategoryFormDTO, employeeId); + iCategoryMapper.insert(iCategoryPO); + + sqlSession.commit(); + + } finally { + sqlSession.close(); + } + } + + /** + * 更新 + * @param iCategoryFormDTO + */ + public void update(ICategoryFormDTO iCategoryFormDTO) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try{ + if (iCategoryFormDTO.getId() == null) { + throw new SalaryRunTimeException("id is required"); + } + ICategoryPO iCategoryPO = getICategoryPOByID(iCategoryFormDTO.getId()); + if (Objects.isNull(iCategoryPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"数据不存在")); + } + List iCategoryPOS = listByName(iCategoryFormDTO.getInsuranceName()); + if (CollectionUtils.isNotEmpty(iCategoryPOS)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利名称不允许重复")); + } + iCategoryPO.setInsuranceName(iCategoryFormDTO.getInsuranceName()); +// iCategoryPO.setWelfareType(iCategoryFormDTO.getWelfareType().getValue()); +// iCategoryPO.setPaymentScope(SalaryEnumUtil.enumArrToString(iCategoryFormDTO.getPaymentScope())); + iCategoryPO.setUpdateTime(new Date()); + ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); + iCategoryMapper.update(iCategoryPO); + + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } + + /** + * 更新状态 + * @param id + * @param isUse + */ + public void updateStatusById(Long id, Integer isUse) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + if(id == null) { + throw new SalaryRunTimeException("id is required"); + } + if (isUse == null) { + throw new SalaryRunTimeException("isUse is required"); + } +// List insuranceSchemeDetailPOS = new SISchemeBiz().queryListByInsuranceIdIsPayment(id, IsPaymentEnum.YES.getValue()); + List insuranceSchemeDetailPOS = getSISchemeService(user).queryListByInsuranceIdIsPayment(id, IsPaymentEnum.YES.getValue()); + if(CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS) && isUse == 0) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该福利开启缴费，不可删除(或停用)")); + } + ICategoryPO iCategoryPO = getICategoryPOByID(id); + if (Objects.isNull(iCategoryPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"数据记录不存在")); + } + iCategoryPO.setIsUse(isUse); + ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); + iCategoryMapper.updateById(iCategoryPO); + + sqlSession.commit(); + }finally { + sqlSession.close(); + } + } + + /*****以上代码为SICategoryBiz中方法逻辑迁移，旨在减少Biz类的使用*****/ + } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 3ab971917..dbe70e770 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -4,10 +4,10 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.eccom.pc.table.WeaTableColumn; +import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.SISchemeBiz; -import com.engine.salary.cmd.sischeme.*; +import com.engine.salary.component.SalaryWeaTable; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; @@ -15,11 +15,17 @@ import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.SIArchiveImportParam; import com.engine.salary.entity.siarchives.po.*; import com.engine.salary.entity.sicategory.po.ICategoryPO; +import com.engine.salary.entity.sischeme.bo.InsuranceSchemeBO; +import com.engine.salary.entity.sischeme.dto.InsuranceSchemeDTO; +import com.engine.salary.entity.sischeme.dto.InsuranceSchemeDetailDTO; import com.engine.salary.entity.sischeme.dto.InsuranceSchemeListDTO; import com.engine.salary.entity.sischeme.param.InsuranceSchemeDetailUpdateParam; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; +import com.engine.salary.entity.sischeme.param.InsuranceSchemeReqParam; import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; +import com.engine.salary.entity.sischeme.vo.InsuranceSchemeFormVO; +import com.engine.salary.entity.sischeme.vo.SISchemeTableVO; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.param.TaxAgentManageRangeSaveParam; @@ -30,6 +36,7 @@ import com.engine.salary.enums.salarysob.TargetTypeEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.sicategory.*; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.siaccount.SIAccountUtilMapper; import com.engine.salary.mapper.siarchives.FundSchemeMapper; import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; import com.engine.salary.mapper.siarchives.OtherSchemeMapper; @@ -60,16 +67,21 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; +import org.apache.ibatis.session.SqlSession; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; +import weaver.conn.mybatis.MyBatisFactory; import weaver.file.ImageFileManager; +import weaver.general.Util; import weaver.hrm.User; import java.io.InputStream; +import java.math.BigDecimal; import java.util.*; import java.util.function.Function; +import java.util.regex.Pattern; import java.util.stream.Collectors; import static com.engine.salary.sys.constant.SalarySysConstant.WEL_BASE_AUTO_ADJUST; @@ -127,7 +139,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } // private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - private SISchemeBiz siSchemeBiz = new SISchemeBiz(); +// private SISchemeBiz siSchemeBiz = new SISchemeBiz(); private SalaryEmployeeService getSalaryEmployeeService(User user) { return (SalaryEmployeeService) ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); @@ -153,39 +165,134 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { return ServiceUtil.getService(SIArchivesServiceImpl.class,user); } + private SIAccountUtilMapper getSIAccountUtilMapper() { + return SqlProxyHandle.getProxy(SIAccountUtilMapper.class); + } + @Override public Map getForm(Map params) { - return commandExecutor.execute(new SISchemeGetFormCmd(params, user)); +// return commandExecutor.execute(new SISchemeGetFormCmd(params, user)); + Map apidatas = new HashMap<>(16); + + Long id = null; + if (Objects.nonNull(params.get("id"))) { + id =Long.valueOf(Util.null2String(params.get("id"))); + } + WelfareTypeEnum welfareTypeEnum = (WelfareTypeEnum)params.get("welfareTypeEnum"); +// InsuranceSchemeFormVO form = siSchemeBiz.getForm(id, welfareTypeEnum); + InsuranceSchemeFormVO form = getForm(id, welfareTypeEnum); + apidatas.put("form",form); + return apidatas; } @Override public Map insertScheme(Map params) { - return commandExecutor.execute(new SISchemeInsertCmd(params, user)); +// return commandExecutor.execute(new SISchemeInsertCmd(params, user)); + Map apidatas = new HashMap(16); + InsuranceSchemeReqParam insuranceSchemeReqParam = (InsuranceSchemeReqParam) params.get("insuranceSchemeReqParam"); +// siSchemeBiz.save(insuranceSchemeReqParam, (long) user.getUID()); + save(insuranceSchemeReqParam, (long) user.getUID()); + return apidatas; } @Override public Map update(Map params) { - return commandExecutor.execute(new SISchemeUpdateCmd(params, user)); +// return commandExecutor.execute(new SISchemeUpdateCmd(params, user)); + Map apidatas = new HashMap(16); + InsuranceSchemeReqParam insuranceSchemeReqParam = (InsuranceSchemeReqParam) params.get("insuranceSchemeReqParam"); +// siSchemeBiz.update(insuranceSchemeReqParam, (long) user.getUID()); + update(insuranceSchemeReqParam, (long) user.getUID()); + return apidatas; } @Override public Map delete(Map params) { - return commandExecutor.execute(new SISchemeDeleteCmd(params, user)); +// return commandExecutor.execute(new SISchemeDeleteCmd(params, user)); + Map apidatas = new HashMap(16); + Collection ids = (Collection)params.get("ids"); + if (CollectionUtils.isEmpty(ids)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"参数错误")); + } + //校验带上类型 + int welfareTypeId = (Integer) params.get("welfareTypeId"); + if(WelfareTypeEnum.SOCIAL_SECURITY.getValue() == welfareTypeId){ +// int num = siSchemeBiz.checkBeforeDeleteSocialscheme(params); + int num = checkBeforeDeleteSocialscheme(params); + if (num > 0){ + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该社保方案已被使用")); + } + } + if(WelfareTypeEnum.ACCUMULATION_FUND.getValue() == welfareTypeId){ +// int accumulationfundNum = siSchemeBiz.checkBeforeDeleteAccumulationfund(params); + int accumulationfundNum = checkBeforeDeleteAccumulationfund(params); + if (accumulationfundNum > 0){ + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该公积金方案已被使用")); + } + } + if(WelfareTypeEnum.OTHER.getValue() == welfareTypeId){ +// int otherschemeNum = siSchemeBiz.checkBeforeDeleteOtherscheme(params); + int otherschemeNum = checkBeforeDeleteOtherscheme(params); + if (otherschemeNum > 0){ + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该其他福利方案已被使用")); + } + } + +// int billNum = siSchemeBiz.checkBeforeDeleteBill(params,welfareTypeId); + int billNum = checkBeforeDeleteBill(params,welfareTypeId); + if (billNum > 0){ + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该福利方案已被核算")); + } +// siSchemeBiz.deleteSocialscheme(params); + deleteSocialscheme(params); + + return apidatas; } @Override public Map copyScheme(Map params) { - return commandExecutor.execute(new SISchemeCopyCmd(params, user)); +// return commandExecutor.execute(new SISchemeCopyCmd(params, user)); + Map apidatas = new HashMap(16); + Long id = (Long) params.get("id"); + String schemeName = Util.null2String(params.get("schemeName")); +// siSchemeBiz.copy(id,schemeName,(long) user.getUID()); + copy(id,schemeName,(long) user.getUID()); + return apidatas; } @Override public List queryListByInsuranceIdIsPayment(Long insuranceId, Integer isPayment) { - return new SISchemeBiz().queryListByInsuranceIdIsPayment(insuranceId, isPayment); +// return new SISchemeBiz().queryListByInsuranceIdIsPayment(insuranceId, isPayment); + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + List insuranceSchemeDetailPOList = insuranceSchemeDetailMapper.queryListByInsuranceIdIsPayment(insuranceId, isPayment); + encryptUtil.decryptList(insuranceSchemeDetailPOList, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPOList; + } finally { + sqlSession.close(); + } } @Override public Map listPage(Map params) { - return commandExecutor.execute(new SISchemeListCmd(params, user)); +// return commandExecutor.execute(new SISchemeListCmd(params, user)); + SalaryWeaTable table = new SalaryWeaTable<>(user,SISchemeTableVO.class); + String sqlWhere = buildSqlWhere(params); + table.setSqlwhere(sqlWhere); + + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + return result.getResultMap(); + } + + private String buildSqlWhere(Map params) { + String sqlWhere = "where a.id = b.primary_id and b.insurance_id = c.id and a.delete_Type = 0"; + Integer welfareType = (Integer)params.get("welfareType"); + if (Objects.nonNull(welfareType)){ + sqlWhere += " and a.welfare_type ="+welfareType; + } + return sqlWhere; } @Override @@ -1991,7 +2098,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { schemeDetailList.forEach(f -> { schemeDetailUpdateMap.put(f.getInsuranceId() + "-" + f.getPaymentScope(), f); }); - List schemeDetailPOS = siSchemeBiz.listByPrimaryId(primaryId); +// List schemeDetailPOS = siSchemeBiz.listByPrimaryId(primaryId); + List schemeDetailPOS = listByPrimaryId(primaryId); //替换修改字段 if (schemeDetailPOS.size() > 0) { schemeDetailPOS.forEach(f -> { @@ -2012,5 +2120,423 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } return errorInfo; } + /*****以下代码为SISchemeBiz中逻辑迁移，旨在减少Biz类的使用*****/ + /** + * 获取社保方案 + * + * @param id + * @param welfareTypeEnum + * @return + */ + public InsuranceSchemeFormVO getForm(Long id, WelfareTypeEnum welfareTypeEnum) { + InsuranceSchemeDTO insuranceSchemeDTO = getSchemeFormDTO(welfareTypeEnum, id); + List insuranceSchemeDetailDTOList = getSchemeDetailFormDTO(welfareTypeEnum, id); + return InsuranceSchemeFormVO.builder().schemeBatch(insuranceSchemeDTO).schemeDetailList(insuranceSchemeDetailDTOList).build(); + } + + /** + * 获取方案主表信息 新建|详情 + * + * @param welfareTypeEnum 福利类型 + * @param id 方案主键id + * @return form + */ + private InsuranceSchemeDTO getSchemeFormDTO(WelfareTypeEnum welfareTypeEnum, Long id) { + InsuranceSchemeDTO insuranceSchemeDTO = InsuranceSchemeDTO.builder().paymentType(PaymentTypeEnum.SCHEME_TOWN).welfareType(welfareTypeEnum).build(); + if (id != null) { + InsuranceSchemePO insuranceSchemePO = getById(id); + SalaryAssert.notNull(insuranceSchemePO, SalaryI18nUtil.getI18nLabel(0,"福利方案不存在")); + //BeanUtils.copyProperties(insuranceSchemePO, insuranceSchemeDTO); + insuranceSchemeDTO.setId(insuranceSchemePO.getId()); + insuranceSchemeDTO.setPaymentArea(insuranceSchemePO.getPaymentArea()); + insuranceSchemeDTO.setRemarks(insuranceSchemePO.getRemarks()); + insuranceSchemeDTO.setSchemeName(insuranceSchemePO.getSchemeName()); + insuranceSchemeDTO.setPaymentType(SalaryEnumUtil.enumMatchByValue(insuranceSchemePO.getPaymentType(), PaymentTypeEnum.values(), PaymentTypeEnum.class)); + insuranceSchemeDTO.setWelfareType(welfareTypeEnum); + insuranceSchemeDTO.setSharedType(StringUtils.isBlank(insuranceSchemePO.getSharedType()) ? "0" : insuranceSchemePO.getSharedType()); + insuranceSchemeDTO.setTaxAgentIds(insuranceSchemePO.getTaxAgentIds()); + } + return insuranceSchemeDTO; + } + + /** + * 获取方案明细表集合 新建|详情 + * + * @param welfareTypeEnum 福利类型 + * @param id 方案主键id + * @return form + */ + public List getSchemeDetailFormDTO(WelfareTypeEnum welfareTypeEnum, Long id) { + List insuranceCategoryPOS = listByWelfareType(welfareTypeEnum.getValue()); + List insuranceSchemeDetailDTOList = new ArrayList<>(); + insuranceCategoryPOS.forEach(item -> { + PaymentScopeEnum[] paymentScopeEnums = SalaryEnumUtil.stringToEnums(item.getPaymentScope(), ","); + Arrays.stream(paymentScopeEnums).forEach(e -> { + InsuranceSchemeDetailDTO insuranceSchemeDetailDTO = InsuranceSchemeDetailDTO.builder().build(); + InsuranceSchemeDetailPO insuranceSchemeDetailPO = getByPPI(id, e.getValue(), item.getId()); + if (insuranceSchemeDetailPO == null) { + insuranceSchemeDetailDTO = InsuranceSchemeDetailDTO.builder() + .id((long) (Math.random() * 10000)) + .insuranceId(item.getId()) + .insuranceName(item.getInsuranceName()) + .paymentScope(e.getDefaultLabel()) + .rententionRule(String.valueOf(RententionRuleEnum.ROUND.getValue())) + .cycleSetting("000000000000") + .paymentCycle("0") + .accountType("0") + .build(); + if (Objects.equals(item.getDataType(), DataTypeEnum.SYSTEM.getValue())) { + insuranceSchemeDetailDTO.setIsPayment(true); + } else { + insuranceSchemeDetailDTO.setIsPayment(false); + } + } else { + //BeanUtils.copyProperties(insuranceSchemeDetailPO, insuranceSchemeDetailDTO); + insuranceSchemeDetailDTO.setEffectiveTime(insuranceSchemeDetailPO.getEffectiveTime()); + insuranceSchemeDetailDTO.setExpirationTime(insuranceSchemeDetailPO.getExpirationTime()); + insuranceSchemeDetailDTO.setId(insuranceSchemeDetailPO.getId()); + insuranceSchemeDetailDTO.setInsuranceId(insuranceSchemeDetailPO.getInsuranceId()); + insuranceSchemeDetailDTO.setPaymentScopeValue(insuranceSchemeDetailPO.getPaymentScope()); + insuranceSchemeDetailDTO.setPrimaryId(insuranceSchemeDetailPO.getPrimaryId()); + insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum()); + + if (insuranceSchemeDetailPO.getIsPayment() != null) { + insuranceSchemeDetailDTO.setIsPayment(Objects.equals(insuranceSchemeDetailPO.getIsPayment(), IsPaymentEnum.YES.getValue())); + } + if (insuranceSchemeDetailPO.getPaymentCycle() != null) { + insuranceSchemeDetailDTO.setPaymentCycle(insuranceSchemeDetailPO.getPaymentCycle() + ""); + } else { + insuranceSchemeDetailDTO.setPaymentCycle("0"); + } + if (insuranceSchemeDetailPO.getAccountType() != null) { + insuranceSchemeDetailDTO.setAccountType(insuranceSchemeDetailPO.getAccountType() + ""); + } else { + insuranceSchemeDetailDTO.setAccountType("0"); + } + if (insuranceSchemeDetailPO.getCycleSetting() == null) { + insuranceSchemeDetailDTO.setCycleSetting("000000000000"); + } else { + insuranceSchemeDetailDTO.setCycleSetting(insuranceSchemeDetailPO.getCycleSetting()); + } + if (StringUtils.isNotBlank(insuranceSchemeDetailPO.getUpperLimit())) { + BigDecimal bigDecimal = new BigDecimal(insuranceSchemeDetailPO.getUpperLimit()); + insuranceSchemeDetailDTO.setUpperLimit(numberCheck(bigDecimal.toPlainString()) ? null : bigDecimal); + } + if (StringUtils.isNotBlank(insuranceSchemeDetailPO.getLowerLimit())) { + BigDecimal bigDecimal = new BigDecimal(insuranceSchemeDetailPO.getLowerLimit()); + insuranceSchemeDetailDTO.setLowerLimit(numberCheck(bigDecimal.toPlainString()) ? null : bigDecimal); + } + if (StringUtils.isNotBlank(insuranceSchemeDetailPO.getPaymentProportion())) { + BigDecimal bigDecimal = new BigDecimal(insuranceSchemeDetailPO.getPaymentProportion()); + insuranceSchemeDetailDTO.setPaymentProportion(numberCheck(bigDecimal.toPlainString()) ? null : bigDecimal); + } + if (StringUtils.isNotBlank(insuranceSchemeDetailPO.getFixedCost())) { + BigDecimal bigDecimal = new BigDecimal(insuranceSchemeDetailPO.getFixedCost()); + insuranceSchemeDetailDTO.setFixedCost(numberCheck(bigDecimal.toPlainString()) ? null : bigDecimal); + } + insuranceSchemeDetailDTO.setInsuranceName(item.getInsuranceName()); + insuranceSchemeDetailDTO.setRententionRule(String.valueOf(insuranceSchemeDetailPO.getRententionRule())); + insuranceSchemeDetailDTO.setPaymentScope(e.getDefaultLabel()); + + } + insuranceSchemeDetailDTO.setPaymentScopeValue(e.getValue()); + insuranceSchemeDetailDTOList.add(insuranceSchemeDetailDTO); + }); + }); + return insuranceSchemeDetailDTOList; + } + + /** + * 社保方案基础信息主表 + * + * @param id + * @return + */ + public InsuranceSchemePO getById(Long id) { + + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + InsuranceSchemePO insuranceSchemePO = insuranceSchemeMapper.getById(id); + + return insuranceSchemePO; + } finally { + sqlSession.close(); + } + } + + /** + * 根据福利类型获取 + * + * @param welfareType + * @return + */ + public List listByWelfareType(Integer welfareType) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); + List insuranceCategoryPOS = iCategoryMapper.listByWelfareType(welfareType, null); + return insuranceCategoryPOS; + } finally { + sqlSession.close(); + } + } + + public boolean numberCheck(String number) { + return Pattern.compile("^0\\.[0]*").matcher(number).matches(); + } + + private InsuranceSchemeDetailPO getByPPI(Long primaryId, Integer paymentScope, Long insuranceId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + InsuranceSchemeDetailPO insuranceSchemeDetailPO = insuranceSchemeDetailMapper.getByPPI(primaryId, paymentScope, insuranceId); + encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPO; + } finally { + sqlSession.close(); + } + } + + /** + * 新增 + * + * @param saveParam + * @param employeeId + */ + public void save(InsuranceSchemeReqParam saveParam, long employeeId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + //保存福利项目主表 + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + saveParam.getInsuranceScheme().setSchemeName(StringUtils.trim(saveParam.getInsuranceScheme().getSchemeName())); + List listResult = insuranceSchemeMapper.listByName(saveParam.getInsuranceScheme().getSchemeName()); + SalaryAssert.isEmpty(listResult, SalaryI18nUtil.getI18nLabel(0,"该福利名称已经存在,福利名称系统全局唯一")); + + InsuranceSchemePO insuranceSchemePO = InsuranceSchemeBO.convert2BatchPO(saveParam.getInsuranceScheme(), employeeId); + if (insuranceSchemePO.getSharedType() == null) { + insuranceSchemePO.setSharedType(SharedTypeEnum.PUBLIC.getValue()); + } else { + if (insuranceSchemePO.getSharedType().equals(SharedTypeEnum.PRIVATE.getValue()) && StringUtils.isBlank(insuranceSchemePO.getTaxAgentIds())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案可见性为私有时，未设置可见范围")); + } + } + insuranceSchemeMapper.insert(insuranceSchemePO); + //保存福利项目明细表 + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(saveParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); + encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailMapper::insert); + + sqlSession.commit(); + + } finally { + sqlSession.close(); + } + } + + /** + * 更新 + * + * @param updateParam + * @param employeeId + */ + public void update(InsuranceSchemeReqParam updateParam, long employeeId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + + //查询是否存在福利方案 + InsuranceSchemePO insuranceSchemePO = getById(updateParam.getInsuranceScheme().getId()); + if (Objects.isNull(insuranceSchemePO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利方案不存在")); + } + //去除入参中方案名称的空格 + updateParam.getInsuranceScheme().setSchemeName(StringUtils.trim(updateParam.getInsuranceScheme().getSchemeName())); + //福利方案名称重复 + List insuranceSchemePOList = insuranceSchemeMapper.listByName(updateParam.getInsuranceScheme().getSchemeName()); + if (CollectionUtils.isNotEmpty(insuranceSchemePOList)) { + boolean repeat = insuranceSchemePOList.stream().anyMatch(item -> !Objects.equals(item.getId(), updateParam.getInsuranceScheme().getId())); + SalaryAssert.isTrue(!repeat, SalaryI18nUtil.getI18nLabel(0,"福利方案名称重复")); + } + + if (insuranceSchemePO.getSharedType() == null) { + insuranceSchemePO.setSharedType(SharedTypeEnum.PUBLIC.getValue()); + } else { + if (insuranceSchemePO.getSharedType().equals(SharedTypeEnum.PRIVATE.getValue()) && StringUtils.isBlank(insuranceSchemePO.getTaxAgentIds())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案可见性为私有时，未设置可见范围")); + } + } + + //更新福利方案主表 + InsuranceSchemePO insuranceSchemePO1 = InsuranceSchemeBO.buildInsuranceSchemePO(insuranceSchemePO, updateParam.getInsuranceScheme()); + insuranceSchemeMapper.update(insuranceSchemePO1); + + //更新福利方案明细表 先删后插 + insuranceSchemeDetailMapper.batchDeleteByPrimaryIds(Collections.singleton(updateParam.getInsuranceScheme().getId())); + //更新明细表 + List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(updateParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); + encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailMapper::insert); + + //记录操作日志 + + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } + + public int checkBeforeDeleteSocialscheme(Map params) { + return getSIAccountUtilMapper().checkBeforeDeleteSocialscheme((Collection) params.get("ids")).get(0).getNum(); + } + + public int checkBeforeDeleteAccumulationfund(Map params) { + return getSIAccountUtilMapper().checkBeforeDeleteAccumulationfund((Collection) params.get("ids")).get(0).getNum(); + } + + public int checkBeforeDeleteOtherscheme(Map params) { + return getSIAccountUtilMapper().checkBeforeDeleteOtherscheme((Collection) params.get("ids")).get(0).getNum(); + } + + public int checkBeforeDeleteBill(Map params, Integer welfareTypeId) { + return getSIAccountUtilMapper().checkBeforeDeleteBill((Collection) params.get("ids"), welfareTypeId).get(0).getNum(); + } + + public void deleteSocialscheme(Map params) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + + insuranceSchemeMapper.deleteByIds((Collection) params.get("ids")); + insuranceSchemeDetailMapper.deleteByIds((Collection) params.get("ids")); + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } + + /** + * 复制方案 + * + * @param id + * @param schemeName + * @param employeeId + */ + public void copy(Long id, String schemeName, long employeeId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + //去除入参中方案名称的空格 + schemeName = StringUtils.trim(schemeName); + + List listResult = insuranceSchemeMapper.listByName(schemeName); + SalaryAssert.isEmpty(listResult, SalaryI18nUtil.getI18nLabel(0,"方案名称重复")); + + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + if (Objects.isNull(id)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案id为空")); + } + + if (Objects.isNull(schemeName)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"复制方案名为空")); + } + + InsuranceSchemePO insuranceSchemePO = getById(id); + if (Objects.isNull(insuranceSchemePO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案不存在")); + } + + if (insuranceSchemePO.getSchemeName().equals(schemeName)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案名称重复")); + } + + InsuranceSchemePO batchPO = InsuranceSchemePO.builder() + .creator(employeeId) + .createTime(new Date()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .schemeName(schemeName) + .paymentArea(insuranceSchemePO.getPaymentArea()) + .updateTime(new Date()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .paymentType(insuranceSchemePO.getPaymentType()) + .remarks(insuranceSchemePO.getRemarks()) + .welfareType(insuranceSchemePO.getWelfareType()) + .isUse(insuranceSchemePO.getIsUse()) + .build(); + insuranceSchemeMapper.insert(batchPO); + + List detailList = insuranceSchemeDetailMapper.queryListBySchemeId(id); + detailList = encryptUtil.decryptList(detailList,InsuranceSchemeDetailPO.class); + if (CollectionUtils.isNotEmpty(detailList)) { + List detailPOS = detailList.stream().map(item -> InsuranceSchemeDetailPO.builder() + .creator(employeeId) + .createTime(new Date()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .effectiveTime(item.getEffectiveTime()) + .expirationTime(item.getExpirationTime()) + .fixedCost(item.getFixedCost()) + .insuranceId(item.getInsuranceId()) + .isPayment(item.getIsPayment()) + .lowerLimit(item.getLowerLimit()) + .paymentScope(item.getPaymentScope()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .paymentProportion(item.getPaymentProportion()) + .updateTime(new Date()) + .primaryId(batchPO.getId()) + .rententionRule(item.getRententionRule()) + .upperLimit(item.getUpperLimit()) + .validNum(item.getValidNum()) + .build() + ).collect(Collectors.toList()); + encryptUtil.encryptList(detailPOS, InsuranceSchemeDetailPO.class); + detailPOS.forEach(insuranceSchemeDetailMapper::insert); + } + + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } + + /** + * 社保方案基础信息明细表 + * + * @param primaryId + * @return + */ + public List listByPrimaryId(Long primaryId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); + List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListBySchemeId(primaryId); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPOS; + } finally { + sqlSession.close(); + } + + } + + /** + * 获取所有方案 + * + * @return + */ + @Override + public List listAll(){ + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + List insuranceSchemePOList = insuranceSchemeMapper.listAll(); + return insuranceSchemePOList; + } finally { + sqlSession.close(); + } + } + + /*****以上代码为SISchemeBiz中方法逻辑迁移，旨在减少Biz类的使用*****/ } From 6efbd9deb0ca9b05227ea399bbb17a1be8fda8dc Mon Sep 17 00:00:00 2001 From: sy Date: Sun, 4 Feb 2024 15:10:35 +0800 Subject: [PATCH 088/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E9=83=A8=E5=88=86=E6=96=B0=E5=A2=9E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=ADlabelId=E5=85=A5=E5=8F=82=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA0=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=90=8E?= =?UTF-8?q?=E6=9C=9F=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=80=BB=E8=BE=91=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=97=B6=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AddUpDeductionServiceImpl.java | 6 +++--- .../service/impl/AddUpSituationServiceImpl.java | 6 +++--- .../service/impl/OtherDeductionServiceImpl.java | 6 +++--- .../impl/SalaryAcctEmployeeServiceImpl.java | 8 ++++---- .../service/impl/SalaryAcctExcelServiceImpl.java | 4 ++-- .../impl/SalaryAcctRecordServiceImpl.java | 16 ++++++++-------- .../impl/SalaryAcctResultServiceImpl.java | 8 ++++---- .../service/impl/SalaryItemServiceImpl.java | 12 ++++++------ .../impl/SalarySobCheckRuleServiceImpl.java | 8 ++++---- .../service/impl/SalarySobItemServiceImpl.java | 4 ++-- .../service/impl/SalarySobRangeServiceImpl.java | 4 ++-- .../service/impl/SysSalaryItemServiceImpl.java | 4 ++-- 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index ee208bf2d..4c3eef869 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -445,10 +445,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction if (CollectionUtils.isNotEmpty(saveList)) { LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); loggerContext.setNewValueList(saveList); SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index ecc029dbb..bbeb0506b 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -876,10 +876,10 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation if (CollectionUtils.isNotEmpty(saveList)) { LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除")); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); loggerContext.setNewValueList(saveList); SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index e8cd2de13..b831a5463 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -424,10 +424,10 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction if (CollectionUtils.isNotEmpty(saveList)) { LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 100351, "新增累计专项附加扣除")); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "新增累计专项附加扣除")); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 100351, "新增计专项附加扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 100351, "新增累计专项附加扣除")); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "新增计专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "新增累计专项附加扣除")); loggerContext.setNewValueList(saveList); SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index e87ab0f2e..fa43ef846 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -421,8 +421,8 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员") + ":" + targetName); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "添加薪资核算人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "添加薪资核算人员") + ":" + targetName); loggerContext.setNewValueList(salaryAcctEmployeePOS); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } @@ -488,8 +488,8 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员") + ":" + targetName); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算人员") + ":" + targetName); loggerContext.setOldValueList(salaryAcctEmployeePOS); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 3ce380565..964837f26 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -255,8 +255,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员") + ":" + targetName); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导出环比增加人员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导出环比增加人员") + ":" + targetName); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); return ExcelUtilPlus.genWorkbookV2(rows, sheetName); diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index c13e6ca71..dfc42d16c 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -304,8 +304,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算") + ": " + targetName); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建薪资核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建薪资核算") + ": " + targetName); loggerContext.setNewValues(salaryAcctRecordPO); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); // 返回薪资核算记录id @@ -538,8 +538,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算") + ":" + targetName); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算") + ":" + targetName); loggerContext.setNewValues(salaryAcctRecordPO); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); }); @@ -580,8 +580,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档") + ": " + targetName); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "薪资核算归档")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "薪资核算归档") + ": " + targetName); loggerContext.setNewValues(salaryAcctRecordPO); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } @@ -630,8 +630,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe loggerContext.setTargetId("" + salaryAcctRecordPO.getId()); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98820, "重新核算")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98820, "重新核算") + ": " + targetName); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "重新核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "重新核算") + ": " + targetName); loggerContext.setNewValues(salaryAcctRecordPO); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 6117667a3..fb441a434 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -661,8 +661,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe loggerContext.setTargetId(String.valueOf(salaryAcctEmployeePO.getSalaryAcctRecordId())); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资核算结果") + ": " + operateDesc); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资核算结果") + ": " + operateDesc); loggerContext.setNewValueList(Lists.newArrayList(salaryAcctResultPOS)); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } @@ -866,8 +866,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe loggerContext.setTargetId(String.valueOf(calculateParam.getSalaryAcctRecordId())); loggerContext.setTargetName(targetName); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "薪资核算")); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "薪资核算")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "薪资核算")); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); } catch (Exception e) { log.info("薪资核算出错：{}", e.getMessage(), e); diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index c43393c10..e18e8569a 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -210,8 +210,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); loggerContext.setTargetName(salaryItemPO.getName()); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目") + ": " + salaryItemPO.getName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目") + ": " + salaryItemPO.getName()); loggerContext.setNewValues(salaryItemPO); SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); } @@ -293,8 +293,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); loggerContext.setTargetName(newSalaryItemPO.getName()); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目") + ": " + newSalaryItemPO.getName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资项目") + ": " + newSalaryItemPO.getName()); loggerContext.setOldValues(salaryItemPO); loggerContext.setNewValues(newSalaryItemPO); SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); @@ -358,8 +358,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); loggerContext.setTargetName(salaryItemPO.getName()); loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目") + ": " + salaryItemPO.getName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目") + ": " + salaryItemPO.getName()); loggerContext.setOldValues(salaryItemPO); SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); }); diff --git a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java index 7d22fe009..103b62de8 100644 --- a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java @@ -136,8 +136,8 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC loggerContext.setTargetId("" + salarySobPO.getId()); loggerContext.setTargetName(salarySobPO.getName()); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则") + ": " + newSalarySobCheckRulePO.getName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑校验规则")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑校验规则") + ": " + newSalarySobCheckRulePO.getName()); loggerContext.setOldValues(salarySobCheckRulePO); loggerContext.setNewValues(newSalarySobCheckRulePO); SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); @@ -185,8 +185,8 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC loggerContext.setTargetId("" + salarySobPO.getId()); loggerContext.setTargetName(salarySobPO.getName()); loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则") + ": " + salarySobCheckRulePO.getName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除校验规则")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除校验规则") + ": " + salarySobCheckRulePO.getName()); loggerContext.setOldValues(salarySobCheckRulePO); SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); }); diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index 216e6499e..8a90a0049 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -270,8 +270,8 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe loggerContext.setTargetId("" + salarySob.getId()); loggerContext.setTargetName(salarySob.getName()); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目")); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套薪资项目")); SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java index 0e30a3fd9..232b17e96 100644 --- a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java @@ -186,7 +186,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange } //记录日志 String operateTypeName = Objects.equals(saveParam.getIncludeType(), 1) ? - SalaryI18nUtil.getI18nLabel(98601, "关联人员范围新增对象") : SalaryI18nUtil.getI18nLabel(98602, "从范围中排除新增对象"); + SalaryI18nUtil.getI18nLabel(0, "关联人员范围新增对象") : SalaryI18nUtil.getI18nLabel(0, "从范围中排除新增对象"); LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); loggerContext.setTargetId("" + salarySobPO.getId()); @@ -215,7 +215,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange Integer includeType = salarySobRangePOS.get(0).getIncludeType(); //记录日志 String operateTypeName = Objects.equals(includeType, 1) ? - SalaryI18nUtil.getI18nLabel(98605, "关联人员范围删除对象") : SalaryI18nUtil.getI18nLabel(98606, "从范围中排除删除对象"); + SalaryI18nUtil.getI18nLabel(0, "关联人员范围删除对象") : SalaryI18nUtil.getI18nLabel(0, "从范围中排除删除对象"); salarySobPOS.forEach(salarySobPO -> { LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); diff --git a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java index 18f1500ab..883c886dd 100644 --- a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java @@ -98,8 +98,8 @@ public class SysSalaryItemServiceImpl extends Service implements SysSalaryItemSe loggerContext.setTargetId(String.valueOf(sysSalaryItemPO.getId())); loggerContext.setTargetName(sysSalaryItemPO.getName()); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目") + ": " + sysSalaryItemPO.getName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "添加系统薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "添加系统薪资项目") + ": " + sysSalaryItemPO.getName()); loggerContext.setNewValues(sysSalaryItemPO); SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); }); From 133933e2879c017e23a5a6bcb848608a76596eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 5 Feb 2024 14:04:47 +0800 Subject: [PATCH 089/169] =?UTF-8?q?=E4=BF=AE=E6=94=B9sqlserver=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=8F=92=E5=85=A5=E5=92=8Coracle=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/elog/ElogTableCheckerMapper.xml | 8 ++++---- .../mapper/elog/LocalElogAopDaoMapper.xml | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml index 03e4028ea..71b2cd9e6 100644 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml @@ -258,10 +258,10 @@ tablenamedesc varchar2(50), fieldName varchar2(200), fieldnamelabelid varchar2(200), - newValue varchar2(4000), - oldValue varchar2(4000), - newrealvalue varchar2(4000), - oldrealvalue varchar2(4000), + newValue CLOB, + oldValue CLOB, + newrealvalue CLOB, + oldrealvalue CLOB, fieldDesc varchar2(200), showorder number(*,0) default 0, isdetail number(*,0) default 0 diff --git a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml index 41e8003ef..81eb589f2 100644 --- a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml +++ b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml @@ -78,6 +78,26 @@ + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) + VALUES + ( + #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type} + ) + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, From 5783342b01be4116c5c8fcb8541b1d19f270c460 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 5 Feb 2024 14:06:52 +0800 Subject: [PATCH 090/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E3=80=81=E5=A4=8D=E5=88=B6=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sicategory/dto/ICategoryListDTO.java | 2 +- .../sischeme/po/InsuranceSchemeDetailPO.java | 23 ++ .../entity/sischeme/po/InsuranceSchemePO.java | 16 + .../sischeme/InsuranceSchemeDetailMapper.java | 2 + .../sischeme/InsuranceSchemeDetailMapper.xml | 12 + .../sischeme/InsuranceSchemeMapper.java | 2 + .../mapper/sischeme/InsuranceSchemeMapper.xml | 11 + .../service/impl/SICategoryServiceImpl.java | 2 + .../service/impl/SISchemeServiceImpl.java | 290 ++++++++++++------ 9 files changed, 258 insertions(+), 102 deletions(-) diff --git a/src/com/engine/salary/entity/sicategory/dto/ICategoryListDTO.java b/src/com/engine/salary/entity/sicategory/dto/ICategoryListDTO.java index 5fc4a6cd1..238d4ec13 100644 --- a/src/com/engine/salary/entity/sicategory/dto/ICategoryListDTO.java +++ b/src/com/engine/salary/entity/sicategory/dto/ICategoryListDTO.java @@ -49,7 +49,7 @@ public class ICategoryListDTO { @SalaryTableColumn(column = "payment_scope", width = "30%", text = "缴纳对象",transmethod = "com.engine.salary.transmethod.ICategoryTransMethod.getPaymentcopeTypeName") - @TableTitle(title = "缴纳对象",dataIndex = "paymentScopt",key = "paymentScopt") + @TableTitle(title = "缴纳对象",dataIndex = "paymentScope",key = "paymentScope") private String paymentScope; private String paymentScopeSpan; diff --git a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java index a65ce19d7..3d4200f65 100644 --- a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java +++ b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.sischeme.po; import com.engine.salary.annotation.Encrypt; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -20,114 +21,136 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_scheme_detail +@ElogTransform(name = "福利方案明细") public class InsuranceSchemeDetailPO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 社保方案主表id */ + @ElogTransform(name = "方案主表id") private Long primaryId; /** * 险种id */ + @ElogTransform(name = "福利项id") private Long insuranceId; /** * 生效年月（含） */ + @ElogTransform(name = "生效年月") private String effectiveTime; /** * 失效年月（不含） */ + @ElogTransform(name = "失效年月") private String expirationTime; /** * 是否缴费 0-否 1-是 */ + @ElogTransform(name = "是否缴费") private Integer isPayment; /** * 缴纳对象 */ + @ElogTransform(name = "缴纳对象") private Integer paymentScope; /** * 基数上限 */ @Encrypt + @ElogTransform(name = "基数上限") private String upperLimit; /** * 基数下限 */ @Encrypt + @ElogTransform(name = "基数下限") private String lowerLimit; /** * 缴纳比例 */ + @ElogTransform(name = "缴纳比例") private String paymentProportion; /** * 固定费用 */ @Encrypt + @ElogTransform(name = "固定费用") private String fixedCost; /** * 有效小数位 */ + @ElogTransform(name = "有效小数位") private Integer validNum; /** * 进位规则 */ + @ElogTransform(name = "进位规则") private Integer rententionRule; /** * 缴纳周期，0不进行周期缴纳，1进行周期缴纳 */ + @ElogTransform(name = "是否周期缴纳") private Integer paymentCycle; /** * 核算方式 */ + @ElogTransform(name = "核算方式") private Integer accountType; /** * 缴纳周期规则设置 */ + @ElogTransform(name = "缴纳周期规则设置") private String cycleSetting; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; } diff --git a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java index cf97a990f..8cdcc7f6c 100644 --- a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java +++ b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.sischeme.po; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.enums.sicategory.SharedTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -20,31 +21,37 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_social_security_scheme +@ElogTransform(name = "福利方案") public class InsuranceSchemePO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 缴纳地区 */ + @ElogTransform(name = "缴纳地区") private String paymentArea; /** * 方案名称 */ + @ElogTransform(name = "方案名称") private String schemeName; /** * 缴纳类型 */ + @ElogTransform(name = "缴纳类型") private Integer paymentType; /** * 福利类型 */ + @ElogTransform(name = "福利类型") private Integer welfareType; /** @@ -52,46 +59,55 @@ public class InsuranceSchemePO { * * @see SharedTypeEnum */ + @ElogTransform(name = "共享权限") private String sharedType; /** * 个税扣缴义务人 */ + @ElogTransform(name = "个税扣缴义务人") private String taxAgentIds; /** * 是否启用 0-停用 1-启用 */ + @ElogTransform(name = "是否启用") private Integer isUse; /** * 备注 */ + @ElogTransform(name = "备注") private String remarks; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; } diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java index 52c98c89d..9af378c42 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java @@ -74,6 +74,8 @@ public interface InsuranceSchemeDetailMapper { List listAll(); + List listBySchemeIds(@Param("schemeIds")Collection schemeIds); + int batchUpdate(@Param("collection") List insuranceSchemeDetailPos); int updateAll(InsuranceSchemeDetailPO insuranceSchemeDetailPo); diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml index dba56d9b9..d4b15075f 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -270,6 +270,18 @@ WHERE delete_type = 0 + + update hrsa_scheme_detail diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java index 7403a8511..11cbfd0b2 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java @@ -51,6 +51,8 @@ public interface InsuranceSchemeMapper { */ List listAll(); + List listBySchemeIds(@Param("schemeIds")Collection schemeIds); + /** * 获取名称 diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml index d6a671a92..d70a73724 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml @@ -87,6 +87,17 @@ ORDER BY id DESC + listResult = insuranceSchemeMapper.listByName(saveParam.getInsuranceScheme().getSchemeName()); - SalaryAssert.isEmpty(listResult, SalaryI18nUtil.getI18nLabel(0,"该福利名称已经存在,福利名称系统全局唯一")); - InsuranceSchemePO insuranceSchemePO = InsuranceSchemeBO.convert2BatchPO(saveParam.getInsuranceScheme(), employeeId); - if (insuranceSchemePO.getSharedType() == null) { - insuranceSchemePO.setSharedType(SharedTypeEnum.PUBLIC.getValue()); - } else { - if (insuranceSchemePO.getSharedType().equals(SharedTypeEnum.PRIVATE.getValue()) && StringUtils.isBlank(insuranceSchemePO.getTaxAgentIds())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案可见性为私有时，未设置可见范围")); - } + //保存福利项目主表 + saveParam.getInsuranceScheme().setSchemeName(StringUtils.trim(saveParam.getInsuranceScheme().getSchemeName())); + List listResult = getInsuranceSchemeMapper().listByName(saveParam.getInsuranceScheme().getSchemeName()); + SalaryAssert.isEmpty(listResult, SalaryI18nUtil.getI18nLabel(0,"该福利名称已经存在,福利名称系统全局唯一")); + + InsuranceSchemePO insuranceSchemePO = InsuranceSchemeBO.convert2BatchPO(saveParam.getInsuranceScheme(), employeeId); + if (insuranceSchemePO.getSharedType() == null) { + insuranceSchemePO.setSharedType(SharedTypeEnum.PUBLIC.getValue()); + } else { + if (insuranceSchemePO.getSharedType().equals(SharedTypeEnum.PRIVATE.getValue()) && StringUtils.isBlank(insuranceSchemePO.getTaxAgentIds())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案可见性为私有时，未设置可见范围")); } - insuranceSchemeMapper.insert(insuranceSchemePO); - //保存福利项目明细表 - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(saveParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); - encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailMapper::insert); - - sqlSession.commit(); - - } finally { - sqlSession.close(); } + getInsuranceSchemeMapper().insert(insuranceSchemePO); + //记录操作日志 + List schemePOList = getInsuranceSchemeMapper().listByName(insuranceSchemePO.getSchemeName()); + InsuranceSchemePO targetPO = new InsuranceSchemePO(); + if (schemePOList != null && schemePOList.size() > 0) { + targetPO = schemePOList.get(0); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(targetPO.getSchemeName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建福利方案")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建福利方案") + ": " + targetPO.getSchemeName()); + loggerContext.setNewValues(targetPO); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + } + //保存福利项目明细表 + List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(saveParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); + //加密入库 + encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + insuranceSchemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::insert); + //记录操作日志 + if (insuranceSchemeDetailPOS.size() > 0) { + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + List allCategoryList = getICategoryMapper().listAll(); + Map categoryNameMap = SalaryEntityUtil.convert2Map(allCategoryList, ICategoryPO::getId, ICategoryPO::getInsuranceName); + + InsuranceSchemePO finalTargetPO = targetPO; + insuranceSchemeDetailPOS.forEach(schemeDetailPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(finalTargetPO.getId())); + loggerContext.setTargetName(categoryNameMap.get(schemeDetailPO.getInsuranceId())); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建福利方案明细")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建福利方案明细") + ": " + + categoryNameMap.get(schemeDetailPO.getInsuranceId()) + + "-" + SalaryEnumUtil.enumMatchByValue(schemeDetailPO.getPaymentScope(), PaymentScopeEnum.values(), PaymentScopeEnum.class)); + loggerContext.setNewValues(schemeDetailPO); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + }); + } + } /** @@ -2406,17 +2439,49 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } public void deleteSocialscheme(Map params) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); - insuranceSchemeMapper.deleteByIds((Collection) params.get("ids")); - insuranceSchemeDetailMapper.deleteByIds((Collection) params.get("ids")); - sqlSession.commit(); - } finally { - sqlSession.close(); + Collection schemeIds = (Collection) params.get("ids"); + List targetPoList = getInsuranceSchemeMapper().listBySchemeIds(schemeIds); + List targetDetailPoList = getInsuranceSchemeDetailMapper().listBySchemeIds(schemeIds); + getInsuranceSchemeMapper().deleteByIds(schemeIds); + getInsuranceSchemeDetailMapper().deleteByIds(schemeIds); + + //记录操作日志 + if (targetPoList.size() > 0) { + targetPoList.forEach(targetPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(targetPO.getSchemeName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利方案")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利方案") + ": " + targetPO.getSchemeName()); + loggerContext.setNewValues(targetPO); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + }); } + if (targetDetailPoList.size() > 0) { + List allCategoryList = getICategoryMapper().listAll(); + Map categoryNameMap = SalaryEntityUtil.convert2Map(allCategoryList, ICategoryPO::getId, ICategoryPO::getInsuranceName); + Map> targetDetailMap = targetDetailPoList.stream() + .collect(Collectors.groupingBy(InsuranceSchemeDetailPO::getPrimaryId)); + targetDetailMap.forEach((k, v) -> { + v.forEach(schemeDetailPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(k)); + loggerContext.setTargetName(categoryNameMap.get(schemeDetailPO.getInsuranceId())); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利方案明细")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利方案明细") + ": " + + categoryNameMap.get(schemeDetailPO.getInsuranceId()) + + "-" + SalaryEnumUtil.enumMatchByValue(schemeDetailPO.getPaymentScope(), PaymentScopeEnum.values(), PaymentScopeEnum.class)); + loggerContext.setNewValues(schemeDetailPO); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + }); + }); + } + } /** @@ -2427,79 +2492,102 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { * @param employeeId */ public void copy(Long id, String schemeName, long employeeId) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); - //去除入参中方案名称的空格 - schemeName = StringUtils.trim(schemeName); - - List listResult = insuranceSchemeMapper.listByName(schemeName); - SalaryAssert.isEmpty(listResult, SalaryI18nUtil.getI18nLabel(0,"方案名称重复")); - - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - if (Objects.isNull(id)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案id为空")); - } - - if (Objects.isNull(schemeName)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"复制方案名为空")); - } - - InsuranceSchemePO insuranceSchemePO = getById(id); - if (Objects.isNull(insuranceSchemePO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案不存在")); - } - - if (insuranceSchemePO.getSchemeName().equals(schemeName)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案名称重复")); - } - - InsuranceSchemePO batchPO = InsuranceSchemePO.builder() + //去除入参中方案名称的空格 + schemeName = StringUtils.trim(schemeName); + List listResult = getInsuranceSchemeMapper().listByName(schemeName); + SalaryAssert.isEmpty(listResult, SalaryI18nUtil.getI18nLabel(0,"方案名称重复")); + if (Objects.isNull(id)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案id为空")); + } + if (Objects.isNull(schemeName)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"复制方案名为空")); + } + InsuranceSchemePO insuranceSchemePO = getById(id); + if (Objects.isNull(insuranceSchemePO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案不存在")); + } + if (insuranceSchemePO.getSchemeName().equals(schemeName)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案名称重复")); + } + InsuranceSchemePO batchPO = InsuranceSchemePO.builder() + .creator(employeeId) + .createTime(new Date()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .schemeName(schemeName) + .paymentArea(insuranceSchemePO.getPaymentArea()) + .updateTime(new Date()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .paymentType(insuranceSchemePO.getPaymentType()) + .remarks(insuranceSchemePO.getRemarks()) + .welfareType(insuranceSchemePO.getWelfareType()) + .isUse(insuranceSchemePO.getIsUse()) + .build(); + getInsuranceSchemeMapper().insert(batchPO); + //记录操作日志 + List schemePOList = getInsuranceSchemeMapper().listByName(insuranceSchemePO.getSchemeName()); + InsuranceSchemePO targetPO = new InsuranceSchemePO(); + if (schemePOList != null && schemePOList.size() > 0) { + targetPO = schemePOList.get(0); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(targetPO.getSchemeName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "复制福利方案")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "复制（新建）福利方案") + ": " + targetPO.getSchemeName()); + loggerContext.setNewValues(targetPO); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + } + List detailList = getInsuranceSchemeDetailMapper().queryListBySchemeId(id); + detailList = encryptUtil.decryptList(detailList,InsuranceSchemeDetailPO.class); + if (CollectionUtils.isNotEmpty(detailList)) { + List detailPOS = detailList.stream().map(item -> InsuranceSchemeDetailPO.builder() .creator(employeeId) .createTime(new Date()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .schemeName(schemeName) - .paymentArea(insuranceSchemePO.getPaymentArea()) - .updateTime(new Date()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .paymentType(insuranceSchemePO.getPaymentType()) - .remarks(insuranceSchemePO.getRemarks()) - .welfareType(insuranceSchemePO.getWelfareType()) - .isUse(insuranceSchemePO.getIsUse()) - .build(); - insuranceSchemeMapper.insert(batchPO); + .effectiveTime(item.getEffectiveTime()) + .expirationTime(item.getExpirationTime()) + .fixedCost(item.getFixedCost()) + .insuranceId(item.getInsuranceId()) + .isPayment(item.getIsPayment()) + .lowerLimit(item.getLowerLimit()) + .paymentScope(item.getPaymentScope()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .paymentProportion(item.getPaymentProportion()) + .updateTime(new Date()) + .primaryId(batchPO.getId()) + .rententionRule(item.getRententionRule()) + .upperLimit(item.getUpperLimit()) + .validNum(item.getValidNum()) + .build() + ).collect(Collectors.toList()); - List detailList = insuranceSchemeDetailMapper.queryListBySchemeId(id); - detailList = encryptUtil.decryptList(detailList,InsuranceSchemeDetailPO.class); - if (CollectionUtils.isNotEmpty(detailList)) { - List detailPOS = detailList.stream().map(item -> InsuranceSchemeDetailPO.builder() - .creator(employeeId) - .createTime(new Date()) - .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .effectiveTime(item.getEffectiveTime()) - .expirationTime(item.getExpirationTime()) - .fixedCost(item.getFixedCost()) - .insuranceId(item.getInsuranceId()) - .isPayment(item.getIsPayment()) - .lowerLimit(item.getLowerLimit()) - .paymentScope(item.getPaymentScope()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .paymentProportion(item.getPaymentProportion()) - .updateTime(new Date()) - .primaryId(batchPO.getId()) - .rententionRule(item.getRententionRule()) - .upperLimit(item.getUpperLimit()) - .validNum(item.getValidNum()) - .build() - ).collect(Collectors.toList()); - encryptUtil.encryptList(detailPOS, InsuranceSchemeDetailPO.class); - detailPOS.forEach(insuranceSchemeDetailMapper::insert); + //加密入库 + encryptUtil.encryptList(detailPOS, InsuranceSchemeDetailPO.class); + detailPOS.forEach(getInsuranceSchemeDetailMapper()::insert); + //记录操作日志 + if (detailPOS.size() > 0) { + encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); + List allCategoryList = getICategoryMapper().listAll(); + Map categoryNameMap = SalaryEntityUtil.convert2Map(allCategoryList, ICategoryPO::getId, ICategoryPO::getInsuranceName); + + InsuranceSchemePO finalTargetPO = targetPO; + detailPOS.forEach(schemeDetailPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(finalTargetPO.getId())); + loggerContext.setTargetName(categoryNameMap.get(schemeDetailPO.getInsuranceId())); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "复制福利方案明细")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "复制（新建）福利方案明细") + ": " + + categoryNameMap.get(schemeDetailPO.getInsuranceId()) + + "-" + SalaryEnumUtil.enumMatchByValue(schemeDetailPO.getPaymentScope(), PaymentScopeEnum.values(), PaymentScopeEnum.class)); + loggerContext.setNewValues(schemeDetailPO); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + }); } - - sqlSession.commit(); - } finally { - sqlSession.close(); } + } /** From 1c252b79da1ba8300695659c11e62c4b4064ac7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 5 Feb 2024 14:34:16 +0800 Subject: [PATCH 091/169] =?UTF-8?q?sqlserver=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=94=B9=E6=88=90nvarchar(max)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/mapper/elog/ElogTableCheckerMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml index 71b2cd9e6..efffc05ab 100644 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml @@ -285,10 +285,10 @@ tablenamedesc nvarchar(50), fieldName nvarchar(200), fieldnamelabelid nvarchar(200), - newValue ntext, - oldValue ntext, - newrealvalue ntext, - oldrealvalue ntext, + newValue nvarchar(max), + oldValue nvarchar(max), + newrealvalue nvarchar(max), + oldrealvalue nvarchar(max), fieldDesc varchar(200), showorder bigint default 0, isdetail bigint default 0 From 395d3f567f1f9808b33a67f83350e54a98964aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 5 Feb 2024 14:48:29 +0800 Subject: [PATCH 092/169] =?UTF-8?q?sqlserver=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=94=B9=E6=88=90nvarchar(max)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml index efffc05ab..3581e1039 100644 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml +++ b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml @@ -122,7 +122,7 @@ operatetype nvarchar(50), operatetypename nvarchar(100), operatedesc nvarchar(3000), - params ntext, + params nvarchar(max), belongmainid nvarchar(36), clientip nvarchar(200), groupid nvarchar(50), From 1c61c0004d209746bfb710615525fb22e94f9551 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 5 Feb 2024 15:04:39 +0800 Subject: [PATCH 093/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=BC=96=E8=BE=91=E5=B9=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E4=B8=BB=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SISchemeServiceImpl.java | 92 ++++++++++--------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index cf93763f7..22e584b4f 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -13,7 +13,7 @@ import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; -import com.engine.salary.entity.salaryitem.po.SalaryItemPO; +import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.SIArchiveImportParam; import com.engine.salary.entity.siarchives.po.*; @@ -2376,50 +2376,54 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { * @param employeeId */ public void update(InsuranceSchemeReqParam updateParam, long employeeId) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - - //查询是否存在福利方案 - InsuranceSchemePO insuranceSchemePO = getById(updateParam.getInsuranceScheme().getId()); - if (Objects.isNull(insuranceSchemePO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利方案不存在")); - } - //去除入参中方案名称的空格 - updateParam.getInsuranceScheme().setSchemeName(StringUtils.trim(updateParam.getInsuranceScheme().getSchemeName())); - //福利方案名称重复 - List insuranceSchemePOList = insuranceSchemeMapper.listByName(updateParam.getInsuranceScheme().getSchemeName()); - if (CollectionUtils.isNotEmpty(insuranceSchemePOList)) { - boolean repeat = insuranceSchemePOList.stream().anyMatch(item -> !Objects.equals(item.getId(), updateParam.getInsuranceScheme().getId())); - SalaryAssert.isTrue(!repeat, SalaryI18nUtil.getI18nLabel(0,"福利方案名称重复")); - } - - if (insuranceSchemePO.getSharedType() == null) { - insuranceSchemePO.setSharedType(SharedTypeEnum.PUBLIC.getValue()); - } else { - if (insuranceSchemePO.getSharedType().equals(SharedTypeEnum.PRIVATE.getValue()) && StringUtils.isBlank(insuranceSchemePO.getTaxAgentIds())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案可见性为私有时，未设置可见范围")); - } - } - - //更新福利方案主表 - InsuranceSchemePO insuranceSchemePO1 = InsuranceSchemeBO.buildInsuranceSchemePO(insuranceSchemePO, updateParam.getInsuranceScheme()); - insuranceSchemeMapper.update(insuranceSchemePO1); - - //更新福利方案明细表 先删后插 - insuranceSchemeDetailMapper.batchDeleteByPrimaryIds(Collections.singleton(updateParam.getInsuranceScheme().getId())); - //更新明细表 - List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(updateParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); - encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailMapper::insert); - - //记录操作日志 - - sqlSession.commit(); - } finally { - sqlSession.close(); + //查询是否存在福利方案 + InsuranceSchemePO insuranceSchemePO = getById(updateParam.getInsuranceScheme().getId()); + if (Objects.isNull(insuranceSchemePO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利方案不存在")); } + //去除入参中方案名称的空格 + updateParam.getInsuranceScheme().setSchemeName(StringUtils.trim(updateParam.getInsuranceScheme().getSchemeName())); + //福利方案名称重复 + List insuranceSchemePOList = getInsuranceSchemeMapper().listByName(updateParam.getInsuranceScheme().getSchemeName()); + if (CollectionUtils.isNotEmpty(insuranceSchemePOList)) { + boolean repeat = insuranceSchemePOList.stream().anyMatch(item -> !Objects.equals(item.getId(), updateParam.getInsuranceScheme().getId())); + SalaryAssert.isTrue(!repeat, SalaryI18nUtil.getI18nLabel(0,"福利方案名称重复")); + } + + if (insuranceSchemePO.getSharedType() == null) { + insuranceSchemePO.setSharedType(SharedTypeEnum.PUBLIC.getValue()); + } else { + if (insuranceSchemePO.getSharedType().equals(SharedTypeEnum.PRIVATE.getValue()) && StringUtils.isBlank(insuranceSchemePO.getTaxAgentIds())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案可见性为私有时，未设置可见范围")); + } + } + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(insuranceSchemePO.getId().toString()); + loggerContext.setTargetName(insuranceSchemePO.getSchemeName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利方案保存")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案保存") + ": " + insuranceSchemePO.getSchemeName()); + loggerContext.setOldValues(insuranceSchemePO); + //更新福利方案主表 + InsuranceSchemePO insuranceSchemePO1 = InsuranceSchemeBO.buildInsuranceSchemePO(insuranceSchemePO, updateParam.getInsuranceScheme()); + getInsuranceSchemeMapper().update(insuranceSchemePO1); + //记录操作日志 + loggerContext.setNewValues(insuranceSchemePO1); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); + List oldInsuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(updateParam.getInsuranceScheme().getId()); + encryptUtil.decryptList(oldInsuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + + //更新福利方案明细表 先删后插 + getInsuranceSchemeDetailMapper().batchDeleteByPrimaryIds(Collections.singleton(updateParam.getInsuranceScheme().getId())); + //更新明细表 + List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(updateParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); + encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + insuranceSchemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::insert); + //记录操作日志, todo + + } public int checkBeforeDeleteSocialscheme(Map params) { From 405fe226d992c06a9ddbdd3667720b841e37a3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 5 Feb 2024 16:33:43 +0800 Subject: [PATCH 094/169] =?UTF-8?q?=E5=88=A0=E9=99=A4elog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/salary/web/LoggerTableController.java | 15 - .../engine/salary/elog/annotation/Elog.java | 23 - .../elog/annotation/ElogDetailField.java | 14 - .../elog/annotation/ElogDetailTable.java | 13 - .../salary/elog/annotation/ElogField.java | 23 - .../elog/annotation/ElogPrimaryKey.java | 9 - .../salary/elog/annotation/ElogTable.java | 16 - .../salary/elog/annotation/ElogTransform.java | 29 - .../salary/elog/annotation/HandleElog.java | 17 - .../salary/elog/annotation/LoggerTarget.java | 22 - .../salary/elog/annotation/OperateType.java | 15 - .../elog/annotation/handle/ElogHandler.java | 177 -- .../annotation/handle/ElogTableScanner.java | 156 -- .../handle/LoggerTargetHandler.java | 38 - .../elog/async/LoggerMessageListener.java | 30 - .../engine/salary/elog/config/ELogCache.java | 25 - .../salary/elog/config/ELogTableChecker.java | 44 - .../salary/elog/entity/dto/CancelContext.java | 25 - .../salary/elog/entity/dto/DataTypeEnum.java | 16 - .../salary/elog/entity/dto/ElogBean.java | 116 -- .../elog/entity/dto/FilterConditionDto.java | 91 -- .../engine/salary/elog/entity/dto/Like.java | 31 - .../salary/elog/entity/dto/LoggerContext.java | 890 ---------- .../elog/entity/dto/LoggerDetailContext.java | 316 ---- .../elog/entity/dto/ReadInfoEntity.java | 40 - .../salary/elog/entity/dto/RedoContext.java | 24 - .../salary/elog/entity/dto/ShowColumsDto.java | 105 -- .../elog/entity/dto/TableChangeBean.java | 153 -- .../elog/entity/dto/TableColumnBean.java | 155 -- .../elog/entity/param/ELogGetLogParam.java | 35 - .../entity/param/GetDetailChangesParam.java | 29 - .../engine/salary/elog/enums/ElogConsts.java | 22 - .../salary/elog/enums/FromTerminalType.java | 48 - .../engine/salary/elog/enums/LinkType.java | 173 -- .../salary/elog/enums/OperateAuditType.java | 14 - .../elog/service/ILocalElogService.java | 13 - .../elog/service/ILoggerTableService.java | 41 - .../elog/service/impl/LocalElogService.java | 435 ----- .../elog/service/impl/LoggerTableService.java | 1454 ----------------- .../elog/threadlocal/ElogThreadLocal.java | 75 - .../salary/elog/util/ElogServiceUtils.java | 92 -- .../elog/util/ElogSeviceSwitchUtils.java | 1402 ---------------- .../salary/elog/util/ElogSeviceUtils.java | 528 ------ .../engine/salary/elog/util/ElogUtils.java | 713 -------- .../engine/salary/elog/util/FieldNameMap.java | 94 -- .../salary/elog/util/LoggerTemplate.java | 630 ------- .../elog/util/LoggerTemplateBuilder.java | 21 - .../elog/web/LoggerTableController.java | 200 --- .../mapper/elog/ElogTableCheckerMapper.java | 30 - .../mapper/elog/ElogTableCheckerMapper.xml | 451 ----- .../mapper/elog/LocalElogAopDaoMapper.java | 45 - .../mapper/elog/LocalElogAopDaoMapper.xml | 170 -- .../mapper/elog/LocalElogDaoMapper.java | 219 --- .../salary/mapper/elog/LocalElogDaoMapper.xml | 412 ----- .../mapper/elog/QueryCurretValusMapper.java | 8 - .../mapper/elog/QueryCurretValusMapper.xml | 9 - 56 files changed, 9991 deletions(-) delete mode 100644 src/com/api/salary/web/LoggerTableController.java delete mode 100644 src/com/engine/salary/elog/annotation/Elog.java delete mode 100644 src/com/engine/salary/elog/annotation/ElogDetailField.java delete mode 100644 src/com/engine/salary/elog/annotation/ElogDetailTable.java delete mode 100644 src/com/engine/salary/elog/annotation/ElogField.java delete mode 100644 src/com/engine/salary/elog/annotation/ElogPrimaryKey.java delete mode 100644 src/com/engine/salary/elog/annotation/ElogTable.java delete mode 100644 src/com/engine/salary/elog/annotation/ElogTransform.java delete mode 100644 src/com/engine/salary/elog/annotation/HandleElog.java delete mode 100644 src/com/engine/salary/elog/annotation/LoggerTarget.java delete mode 100644 src/com/engine/salary/elog/annotation/OperateType.java delete mode 100644 src/com/engine/salary/elog/annotation/handle/ElogHandler.java delete mode 100644 src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java delete mode 100644 src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java delete mode 100644 src/com/engine/salary/elog/async/LoggerMessageListener.java delete mode 100644 src/com/engine/salary/elog/config/ELogCache.java delete mode 100644 src/com/engine/salary/elog/config/ELogTableChecker.java delete mode 100644 src/com/engine/salary/elog/entity/dto/CancelContext.java delete mode 100644 src/com/engine/salary/elog/entity/dto/DataTypeEnum.java delete mode 100644 src/com/engine/salary/elog/entity/dto/ElogBean.java delete mode 100644 src/com/engine/salary/elog/entity/dto/FilterConditionDto.java delete mode 100644 src/com/engine/salary/elog/entity/dto/Like.java delete mode 100644 src/com/engine/salary/elog/entity/dto/LoggerContext.java delete mode 100644 src/com/engine/salary/elog/entity/dto/LoggerDetailContext.java delete mode 100644 src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java delete mode 100644 src/com/engine/salary/elog/entity/dto/RedoContext.java delete mode 100644 src/com/engine/salary/elog/entity/dto/ShowColumsDto.java delete mode 100644 src/com/engine/salary/elog/entity/dto/TableChangeBean.java delete mode 100644 src/com/engine/salary/elog/entity/dto/TableColumnBean.java delete mode 100644 src/com/engine/salary/elog/entity/param/ELogGetLogParam.java delete mode 100644 src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java delete mode 100644 src/com/engine/salary/elog/enums/ElogConsts.java delete mode 100644 src/com/engine/salary/elog/enums/FromTerminalType.java delete mode 100644 src/com/engine/salary/elog/enums/LinkType.java delete mode 100644 src/com/engine/salary/elog/enums/OperateAuditType.java delete mode 100644 src/com/engine/salary/elog/service/ILocalElogService.java delete mode 100644 src/com/engine/salary/elog/service/ILoggerTableService.java delete mode 100644 src/com/engine/salary/elog/service/impl/LocalElogService.java delete mode 100644 src/com/engine/salary/elog/service/impl/LoggerTableService.java delete mode 100644 src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java delete mode 100644 src/com/engine/salary/elog/util/ElogServiceUtils.java delete mode 100644 src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java delete mode 100644 src/com/engine/salary/elog/util/ElogSeviceUtils.java delete mode 100644 src/com/engine/salary/elog/util/ElogUtils.java delete mode 100644 src/com/engine/salary/elog/util/FieldNameMap.java delete mode 100644 src/com/engine/salary/elog/util/LoggerTemplate.java delete mode 100644 src/com/engine/salary/elog/util/LoggerTemplateBuilder.java delete mode 100644 src/com/engine/salary/elog/web/LoggerTableController.java delete mode 100644 src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java delete mode 100644 src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml delete mode 100644 src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java delete mode 100644 src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml delete mode 100644 src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java delete mode 100644 src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml delete mode 100644 src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java delete mode 100644 src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml diff --git a/src/com/api/salary/web/LoggerTableController.java b/src/com/api/salary/web/LoggerTableController.java deleted file mode 100644 index ddf2b4f41..000000000 --- a/src/com/api/salary/web/LoggerTableController.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.api.salary.web; - -import javax.ws.rs.Path; - -/** - * 日志列表公共接口暴漏 - *

Copyright: Copyright (c) 2023

- *

Company: 泛微软件

- * - * @author qiantao - * @version 1.0 - **/ -@Path("/bs/hrmsalary/elog") -public class LoggerTableController extends com.engine.salary.elog.web.LoggerTableController{ -} diff --git a/src/com/engine/salary/elog/annotation/Elog.java b/src/com/engine/salary/elog/annotation/Elog.java deleted file mode 100644 index 7e00ca25e..000000000 --- a/src/com/engine/salary/elog/annotation/Elog.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.engine.salary.elog.annotation; - -import java.lang.annotation.*; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD}) -public @interface Elog { - - String module(); - - String function(); - - String operateType(); - - String operateTypeName(); - - String sql() default ""; - - boolean isLocal() default true; - - String infoMethod() default ""; -} diff --git a/src/com/engine/salary/elog/annotation/ElogDetailField.java b/src/com/engine/salary/elog/annotation/ElogDetailField.java deleted file mode 100644 index 129c57da8..000000000 --- a/src/com/engine/salary/elog/annotation/ElogDetailField.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.engine.salary.elog.annotation; - -import java.lang.annotation.*; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) -public @interface ElogDetailField { - - String fieldType() default "varchar"; - String length() default "50"; - String fieldName(); - String desc() default "自定义字段"; -} diff --git a/src/com/engine/salary/elog/annotation/ElogDetailTable.java b/src/com/engine/salary/elog/annotation/ElogDetailTable.java deleted file mode 100644 index d5054b7c1..000000000 --- a/src/com/engine/salary/elog/annotation/ElogDetailTable.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.engine.salary.elog.annotation; - -import java.lang.annotation.*; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface ElogDetailTable { - - String module(); - - String function() default "common"; -} diff --git a/src/com/engine/salary/elog/annotation/ElogField.java b/src/com/engine/salary/elog/annotation/ElogField.java deleted file mode 100644 index a60c1f6a7..000000000 --- a/src/com/engine/salary/elog/annotation/ElogField.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.engine.salary.elog.annotation; - -import com.engine.salary.elog.entity.dto.DataTypeEnum; - -import java.lang.annotation.*; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) -public @interface ElogField { - - DataTypeEnum dataType() default DataTypeEnum.VARCHAR; - - int length() default 50; - - String comment() default "自定义字段"; - - String defaultValue() default ""; - - boolean isNull() default true; - - boolean isKey() default false; -} diff --git a/src/com/engine/salary/elog/annotation/ElogPrimaryKey.java b/src/com/engine/salary/elog/annotation/ElogPrimaryKey.java deleted file mode 100644 index 291f82562..000000000 --- a/src/com/engine/salary/elog/annotation/ElogPrimaryKey.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.engine.salary.elog.annotation; - -import java.lang.annotation.*; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.PARAMETER}) -public @interface ElogPrimaryKey { -} diff --git a/src/com/engine/salary/elog/annotation/ElogTable.java b/src/com/engine/salary/elog/annotation/ElogTable.java deleted file mode 100644 index a236b5b6e..000000000 --- a/src/com/engine/salary/elog/annotation/ElogTable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.engine.salary.elog.annotation; - -import org.springframework.stereotype.Component; - -import java.lang.annotation.*; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) - -public @interface ElogTable { - - String module(); - - String function() default "common"; -} diff --git a/src/com/engine/salary/elog/annotation/ElogTransform.java b/src/com/engine/salary/elog/annotation/ElogTransform.java deleted file mode 100644 index 120c41d8d..000000000 --- a/src/com/engine/salary/elog/annotation/ElogTransform.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.engine.salary.elog.annotation; - -import java.lang.annotation.*; - -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE}) -@Inherited -public @interface ElogTransform { - - String tablename() default ""; - - String name(); - - int labelId() default -1; - - String type() default ""; - - String valuesKVPairs() default ""; - - boolean ignore() default false; - - boolean analyticSubclass() default false; - - boolean analyticList() default false; - - Class analyticListClass() default void.class; - -} diff --git a/src/com/engine/salary/elog/annotation/HandleElog.java b/src/com/engine/salary/elog/annotation/HandleElog.java deleted file mode 100644 index 387666b18..000000000 --- a/src/com/engine/salary/elog/annotation/HandleElog.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.engine.salary.elog.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface HandleElog { - - String modulename() default ""; - - String functionname() default ""; - - String service() default ""; -} diff --git a/src/com/engine/salary/elog/annotation/LoggerTarget.java b/src/com/engine/salary/elog/annotation/LoggerTarget.java deleted file mode 100644 index 701d4f8e6..000000000 --- a/src/com/engine/salary/elog/annotation/LoggerTarget.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.engine.salary.elog.annotation; - -import java.lang.annotation.*; - -/** - * @ClassName: LoggerTarget - * @Description 日志构造器-自定义注解 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface LoggerTarget { -// @AliasFor("module") - String value() default ""; - -// @AliasFor("value") - String module() default ""; - - String function() default "common"; -} diff --git a/src/com/engine/salary/elog/annotation/OperateType.java b/src/com/engine/salary/elog/annotation/OperateType.java deleted file mode 100644 index 7dbb84303..000000000 --- a/src/com/engine/salary/elog/annotation/OperateType.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.engine.salary.elog.annotation; - -public class OperateType { - public static final String view = "view"; - public static final String viewSpan = "查看"; - - public static final String add = "add"; - public static final String addSpan = "新增"; - - public static final String update = "update"; - public static final String updateSpan = "更新"; - - public static final String delete = "delete"; - public static final String deleteSpan = "删除"; -} diff --git a/src/com/engine/salary/elog/annotation/handle/ElogHandler.java b/src/com/engine/salary/elog/annotation/handle/ElogHandler.java deleted file mode 100644 index 7cb1dda25..000000000 --- a/src/com/engine/salary/elog/annotation/handle/ElogHandler.java +++ /dev/null @@ -1,177 +0,0 @@ -//package com.engine.salary.elog.annotation.handle; -// -//import com.weaver.common.async.producer.client.AsyncClient; -//import com.weaver.common.distribution.genid.IdGenerator; -//import com.weaver.common.elog.annotation.Elog; -//import com.weaver.common.elog.annotation.ElogPrimaryKey; -//import com.weaver.common.elog.dao.QueryCurretValusMapper; -//import com.weaver.common.elog.dto.LoggerContext; -//import com.weaver.common.elog.util.LoggerTemplate; -//import org.apache.commons.lang3.StringUtils; -//import org.aspectj.lang.ProceedingJoinPoint; -//import org.aspectj.lang.Signature; -//import org.aspectj.lang.annotation.Around; -//import org.aspectj.lang.annotation.Aspect; -//import org.aspectj.lang.annotation.Pointcut; -//import org.aspectj.lang.reflect.MethodSignature; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.context.ApplicationContext; -//import org.springframework.stereotype.Component; -//import org.springframework.util.ReflectionUtils; -// -//import java.lang.annotation.Annotation; -//import java.lang.reflect.Method; -//import java.util.Date; -//import java.util.List; -//import java.util.Map; -// -// -///** -// * @ClassName: LoggerTargetHandler -// * @Description 从Spring扫描到的类中获取到Elog自定义注解类设置function属性 -// * @Author tanghj -// * @Date 2021/2/10 14:18 -// */ -//@Aspect -// -//public class ElogHandler { -// -// @Autowired -// ApplicationContext applicationContext; -// -// @Autowired -// protected AsyncClient asyncClient; -// -// @Autowired -// QueryCurretValusMapper queryCurretValusMapper; -// -// /** -// * 切面写入日志 -// */ -// @Pointcut("@annotation(com.weaver.common.elog.annotation.Elog)" ) -// public void writeLog(){} -// @Around("writeLog()") -// public Object writeLog(ProceedingJoinPoint pjp){ -// Object[] args = pjp.getArgs(); -// Signature signature = pjp.getSignature(); -// MethodSignature methodSignature = (MethodSignature) signature; -// Method method = methodSignature.getMethod(); -// -// Elog elog = method.getAnnotation(Elog.class); -// String moduleName = elog.module(); -// String funtionName = elog.function(); -// String operateType = elog.operateType(); -// String operateTypeName = elog.operateTypeName(); -// boolean isLocal = elog.isLocal(); -// Annotation[][] annos = method.getParameterAnnotations(); -// -// Object id = null; -// int keyPosition = -1; -// int index = 0; -// -// Class idClass = null; -// // 获取主键id注解 -// for(Annotation[] anno : annos) { -// if(anno.length > 0) { -// for(Annotation annotation : anno) { -// if(annotation instanceof ElogPrimaryKey) { -// idClass = method.getParameters()[index].getType(); -// id = args[index]; -// if(StringUtils.isEmpty(id+"")) { -// id = idClass.cast(IdGenerator.generate() + ""); -// } -// keyPosition = index; -// break; -// } -// } -// } -// index ++; -// } -// -// LoggerContext loggerContext = null; -// // 获取日志实体类 -// for(Object arg: args) { -// if(arg instanceof LoggerContext) { -// loggerContext = (LoggerContext) arg; -// break; -// } -// } -// -// if(loggerContext == null) { -// loggerContext = new LoggerContext(); -// } -// -// // 日志实体类的初始化 -// // loggerContext.setOperateType("UPDATE"); -// loggerContext.setFunctionName(funtionName); -// loggerContext.setModuleName(moduleName); -// loggerContext.setOperateType(operateType); -// loggerContext.setOperateTypeName(operateTypeName); -// loggerContext.setDate(new Date()); -// loggerContext.setDevice("IOS"); -// -// String sql = elog.sql(); -// String infoMethod = elog.infoMethod(); -// -// boolean isSql = false; -// boolean isMethod = false; -// Object currentClass = null; -// Method infoMtd = null; -// if(StringUtils.isNotEmpty(id+"")) { -// if(StringUtils.isNotEmpty(sql)) { -// isSql = true; -// Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); -// loggerContext.setOldValues(oldValue); -// } else if(StringUtils.isNotEmpty(infoMethod)){ -// isMethod = true; -// currentClass = applicationContext.getBean(pjp.getTarget().getClass()); -// // 获取方法 -// infoMtd = ReflectionUtils.findMethod(pjp.getTarget().getClass(),infoMethod, idClass); -// -// // todo 为空的情况加异常提醒 -// // 反射执行方法 -// Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); -// if(res != null) { -// if(res instanceof List) { -// loggerContext.setOldValueList((List) res); -// } else { -// loggerContext.setOldValues(res); -// } -// -// } -// } -// } -// -// LoggerTemplate loggerTemplate = new LoggerTemplate(); -// loggerTemplate.setFunction(funtionName); -// loggerTemplate.setModule(moduleName); -// loggerTemplate.setAsyncClient(asyncClient); -// -// Object result = null; -// try { -// args[keyPosition] = id; -// result = pjp.proceed(args); -// } catch (Throwable throwable) { -// throwable.printStackTrace(); -// } -// if(isSql) { -// Map oldValue = queryCurretValusMapper.queryValues(String.format(sql, id)); -// loggerContext.setNewValues(oldValue); -// } else if(isMethod) { -// Object res= ReflectionUtils.invokeMethod(infoMtd,currentClass, id); -// if(res != null) { -// if(res instanceof List) { -// loggerContext.setNewValueList((List) res); -// } else { -// loggerContext.setNewValues(res); -// } -// } -// } -// if(isLocal) -// loggerTemplate.write(loggerContext); -// else -// loggerTemplate.write(loggerContext,false); -// return result; -// -// } -//} diff --git a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java b/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java deleted file mode 100644 index 709e8e0cb..000000000 --- a/src/com/engine/salary/elog/annotation/handle/ElogTableScanner.java +++ /dev/null @@ -1,156 +0,0 @@ -//package com.engine.salary.elog.annotation.handle; -// -//import com.engine.salary.elog.annotation.ElogField; -//import com.engine.salary.elog.annotation.ElogTable; -//import com.engine.salary.elog.entity.dto.DataTypeEnum; -//import com.engine.salary.elog.entity.dto.TableColumnBean; -//import com.engine.salary.elog.util.ElogUtils; -//import lombok.extern.slf4j.Slf4j; -//import org.reflections.Reflections; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -// -//import java.lang.reflect.Field; -//import java.util.*; -//import java.util.stream.Collectors; -// -///** -// * @ClassName: ElogTableScanner -// * @Description 日志操作表扫描 -// * @Author tanghj -// * @Date 2021/3/12 13:31 -// */ -//@Slf4j -//public class ElogTableScanner { -// private Logger logger = LoggerFactory.getLogger(this.getClass()); -// -//// private TableCheckerMapper tableCheckerMapper; -// -//// @Override -// public void run() throws Exception { -// -// // todo 需要考虑集群下，控制一台机器来跑 -// scanElogTable(); -// -// } -// -// private void scanElogTable() { -// // todo 是否还需要扫描Elog（因为可能不需要本地存储） ELogDetailTable， -//// Map tableBeans = this.applicationContext.getBeansWithAnnotation(ElogTable.class); -// Reflections reflections = new Reflections("com.engine.salary.elog"); -// Set> tableBeans = reflections.getTypesAnnotatedWith(ElogTable.class); -// -// -// List baseColumns = new ArrayList<>(); -// -// Map> tableColumns = elogTableHandle(tableBeans,baseColumns); -// -// for(String tableName : tableColumns.keySet()) { -// -// // todo 需要处理明细表，如果没有直接初始化原始明细表，如果有加上自定义的 -// List columns = tableColumns.get(tableName); -// if(columns == null) { -// columns = baseColumns; -// } else { -// columns.addAll(baseColumns); -// } -// tableCheck(tableName, columns); -// } -// -// } -// -// private Map> elogTableHandle(Set> tableBeans, List baseColumns) { -// Map> tableMap = new HashMap<>(); -// for (Class aClass :tableBeans) {//遍历每个controller层 -// -// List list = new ArrayList<>(); -// -// ElogTable elogTable = aClass.getAnnotation(ElogTable.class); -// -// List fields = Arrays.asList(aClass.getDeclaredFields());//获取方法 -// for (Field f : fields) { -// -// ElogField field = f.getAnnotation(ElogField.class); -// if(field == null) { -// continue; -// } -// -// TableColumnBean tableColumnBean = new TableColumnBean(); -// -// tableColumnBean.setColumnName(f.getName()); -// tableColumnBean.setColumnComment(field.comment()); -// tableColumnBean.setColumnDefault(field.defaultValue()); -// tableColumnBean.setFieldLength(field.length()); -// tableColumnBean.setDataType(field.dataType()); -// tableColumnBean.setNullable(field.isNull()); -// list.add(tableColumnBean); -// } -// if(!ElogUtils.BASE_TABLE.equals(elogTable.module())) { -// tableMap.put(ElogUtils.getTableName(elogTable.module(), elogTable.function()), list); -// } else { -// baseColumns.addAll(list); -// } -// } -// -// return tableMap; -// } -// -// private void tableCheck(String tableName, List columns) { -// List oldColumns = new ArrayList<>(); -//// List oldColumns = tableCheckerMapper.getTableStructure(tableName); -// -// // 表不存在 -// if(oldColumns == null || oldColumns.size() == 0) { -// createTable(tableName,columns ); -// } else { -// Map newcolMap = new HashMap<>(); -// Map oldcolMap = new HashMap<>(); -// -// columns.stream().forEach(tableColumnBean -> newcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean)); -// oldColumns.stream().forEach(tableColumnBean -> { -// tableColumnBean.setDataType(ElogUtils.getEnumFromString(DataTypeEnum.class, tableColumnBean.getDataTypeStr())); -// tableColumnBean.setNullable("YES".equalsIgnoreCase(tableColumnBean.getIsNullableStr())); -// oldcolMap.put(tableColumnBean.getColumnName().toLowerCase(), tableColumnBean); -// }); -// // 只增加或者修改，不删除字段 -// for(String key : newcolMap.keySet()) { -// if(oldcolMap.containsKey(key)) { -// // 字段变动则修改 -// if(!(newcolMap.get(key).toSql()).equals(oldcolMap.get(key).toSql())) -// this.modifyColumn(tableName, newcolMap.get(key)); -// } else { -// this.addColumn(tableName, newcolMap.get(key)); -// } -// } -// } -// -// } -// -// private void createTable(String tableName, List columns) { -// StringBuilder sb = new StringBuilder("create table ").append(tableName).append(" ( "); -// sb.append(columns.stream().map( bean -> bean.toSql()).collect(Collectors.joining(","))); -// sb.append(")"); -// logger.info("创建sql:{}",sb.toString()); -//// tableCheckerMapper.createElogTable(sb.toString()); -// } -// -// private void addColumn(String tableName, TableColumnBean tableColumnBean) { -// StringBuilder sb = new StringBuilder("alter table ") -// .append(tableName).append(" ") -// .append(" add ") -// .append(" column ") -// .append(tableColumnBean.toSql()); -// logger.info("新增字段sql:{}",sb.toString()); -//// tableCheckerMapper.createElogTable(sb.toString()); -// } -// -// private void modifyColumn(String tableName, TableColumnBean tableColumnBean) { -// StringBuilder sb = new StringBuilder("alter table ") -// .append(tableName).append(" ") -// .append(" modify ") -// .append(" column ") -// .append(tableColumnBean.toSql()); -// logger.info("修改字段sql:{}",sb.toString()); -//// tableCheckerMapper.createElogTable(sb.toString()); -// } -//} diff --git a/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java b/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java deleted file mode 100644 index b1934e4d3..000000000 --- a/src/com/engine/salary/elog/annotation/handle/LoggerTargetHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -//package com.engine.salary.elog.annotation.handle; -// -//import com.weaver.common.elog.annotation.LoggerTarget; -//import com.weaver.common.elog.util.LoggerTemplate; -//import org.apache.commons.lang3.StringUtils; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.CommandLineRunner; -//import org.springframework.context.ApplicationContext; -//import org.springframework.stereotype.Component; -// -//import java.util.Map; -// -// -///** -// * @ClassName: LoggerTargetHandler -// * @Description 从Spring扫描到的类中获取到LoggerTarget自定义注解类设置function属性 -// * @Author tanghj -// * @Date 2021/2/10 14:18 -// */ -// -//public class LoggerTargetHandler { -// -// ApplicationContext applicationContext; -// -// @Override -// public void run(String... args) throws Exception { -// Map loggtemplateMap = applicationContext.getBeansWithAnnotation(LoggerTarget.class); -// -// for(Object obj : loggtemplateMap.values()) { -// if(obj instanceof LoggerTemplate) { -// LoggerTarget loggerTarget = obj.getClass().getAnnotation(LoggerTarget.class); -// ((LoggerTemplate) obj).setFunction(loggerTarget.function()); -// ((LoggerTemplate) obj).setModule(StringUtils.isNotEmpty(loggerTarget.value()) ? loggerTarget.value() : loggerTarget.module()); -// } -// -// } -// } -//} diff --git a/src/com/engine/salary/elog/async/LoggerMessageListener.java b/src/com/engine/salary/elog/async/LoggerMessageListener.java deleted file mode 100644 index 2bf5dc957..000000000 --- a/src/com/engine/salary/elog/async/LoggerMessageListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.engine.salary.elog.async; - -import com.engine.salary.elog.config.ELogTableChecker; -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.service.impl.LocalElogService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @ClassName: LoggerMessageListener - * @Description 本地日志存储消息队列监听类 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -public class LoggerMessageListener { - - private final Logger logger = LoggerFactory.getLogger(getClass()); - - LocalElogService localElogService = new LocalElogService(); - - public String receiveold(LoggerContext messageBean) { - - new ELogTableChecker().check(messageBean); - localElogService.insertLocalElog(messageBean); - - return ""; - } - - -} diff --git a/src/com/engine/salary/elog/config/ELogCache.java b/src/com/engine/salary/elog/config/ELogCache.java deleted file mode 100644 index 841bddf18..000000000 --- a/src/com/engine/salary/elog/config/ELogCache.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.engine.salary.elog.config; - -import com.engine.salary.mapper.elog.ElogTableCheckerMapper; -import com.engine.salary.util.db.MapperProxyFactory; - -import java.util.HashMap; -import java.util.Map; - -public class ELogCache { - - private Map tableCache = new HashMap<>(); - - private ElogTableCheckerMapper getTableCheckerMapper() { - return MapperProxyFactory.getProxy(ElogTableCheckerMapper.class); - } - - public Long getVersion(String mainTable) { - Long version = tableCache.get(mainTable); - if (version == null) { - version = getTableCheckerMapper().getVersion(mainTable); - tableCache.put(mainTable, version); - } - return version; - } -} diff --git a/src/com/engine/salary/elog/config/ELogTableChecker.java b/src/com/engine/salary/elog/config/ELogTableChecker.java deleted file mode 100644 index 741dea65c..000000000 --- a/src/com/engine/salary/elog/config/ELogTableChecker.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.engine.salary.elog.config; - -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.mapper.elog.ElogTableCheckerMapper; -import com.engine.salary.util.db.IdGenerator; -import com.engine.salary.util.db.MapperProxyFactory; - - -public class ELogTableChecker { - private static final long version = 0; - private ELogCache eLogCache = new ELogCache(); - - private ElogTableCheckerMapper getTableCheckerMapper() { - return MapperProxyFactory.getProxy(ElogTableCheckerMapper.class); - } - - public void check(LoggerContext loggerContext) { - String module = loggerContext.getModuleName(); - String function = loggerContext.getFunctionName(); - String mainTable = String.format("%s_%slogs", module, function); - Long v = eLogCache.getVersion(mainTable); - boolean noTable = v == null; - if (noTable) { - this.initTable(mainTable); - v = version; - } else { - this.checkVersion(mainTable, v); - } - - } - - private void checkVersion(String mainTable, Long v) { - if (v == version) { - return; - } - } - - - private void initTable(String mainTable) { - getTableCheckerMapper().recordVersion(IdGenerator.generate(), mainTable, version); - getTableCheckerMapper().createMainTable(mainTable); - getTableCheckerMapper().createDetailTable(mainTable + "_detail"); - } -} diff --git a/src/com/engine/salary/elog/entity/dto/CancelContext.java b/src/com/engine/salary/elog/entity/dto/CancelContext.java deleted file mode 100644 index d7ecccb7b..000000000 --- a/src/com/engine/salary/elog/entity/dto/CancelContext.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: CancelContext - * @Description 撤销实体类 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -@ApiModel("撤销实体类") -public class CancelContext { - - @ApiModelProperty("撤销参数") - private T cancleParams; - - public T getCancleParams() { - return cancleParams; - } - - public void setCancleParams(T cancleParams) { - this.cancleParams = cancleParams; - } -} diff --git a/src/com/engine/salary/elog/entity/dto/DataTypeEnum.java b/src/com/engine/salary/elog/entity/dto/DataTypeEnum.java deleted file mode 100644 index b31b8e490..000000000 --- a/src/com/engine/salary/elog/entity/dto/DataTypeEnum.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -public enum DataTypeEnum { - VARCHAR, - BIGINT, - INT, - DATETIME, - TEXT, - LONGTEXT, - DOUBLE, - DECIMAL, - TINYINT, - FLOAT; - - -} diff --git a/src/com/engine/salary/elog/entity/dto/ElogBean.java b/src/com/engine/salary/elog/entity/dto/ElogBean.java deleted file mode 100644 index 84a24cfd9..000000000 --- a/src/com/engine/salary/elog/entity/dto/ElogBean.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * @Date: 2022/5/2 21:51 - * @Author: deli.xu - * @Description: 日志中心bean - **/ -public class ElogBean implements Serializable { - - - private static final long serialVersionUID = 5357552376749564256L; - private String module; - private String function; - private String current; - private String pageSize; - private String dataset; - private String searchMap; - private List showColumns = new ArrayList<>(); - private List filterConditionDtos = new ArrayList<>(); - private String downloadSize; - private String transMethod; - private Map authParamsJson; - - public String getModule() { - return module; - } - - public void setModule(String module) { - this.module = module; - } - - public String getFunction() { - return function; - } - - public void setFunction(String function) { - this.function = function; - } - - public String getCurrent() { - return current; - } - - public void setCurrent(String current) { - this.current = current; - } - - public String getPageSize() { - return pageSize; - } - - public void setPageSize(String pageSize) { - this.pageSize = pageSize; - } - - public String getDataset() { - return dataset; - } - - public void setDataset(String dataset) { - this.dataset = dataset; - } - - public String getSearchMap() { - return searchMap; - } - - public void setSearchMap(String searchMap) { - this.searchMap = searchMap; - } - - public List getShowColumns() { - return showColumns; - } - - public void setShowColumns(List showColumns) { - this.showColumns = showColumns; - } - - public List getFilterConditionDtos() { - return filterConditionDtos; - } - - public void setFilterConditionDtos(List filterConditionDtos) { - this.filterConditionDtos = filterConditionDtos; - } - - public String getDownloadSize() { - return downloadSize; - } - - public void setDownloadSize(String downloadSize) { - this.downloadSize = downloadSize; - } - - public String getTransMethod() { - return transMethod; - } - - public void setTransMethod(String transMethod) { - this.transMethod = transMethod; - } - - public Map getAuthParamsJson() { - return authParamsJson; - } - - public void setAuthParamsJson(Map authParamsJson) { - this.authParamsJson = authParamsJson; - } -} diff --git a/src/com/engine/salary/elog/entity/dto/FilterConditionDto.java b/src/com/engine/salary/elog/entity/dto/FilterConditionDto.java deleted file mode 100644 index 28cb451e5..000000000 --- a/src/com/engine/salary/elog/entity/dto/FilterConditionDto.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import java.io.Serializable; - -/** - * @date: 2021/5/25 17:23 - * @author: deli.xu - * @description: - */ -public class FilterConditionDto implements Serializable { - - private static final long serialVersionUID = -3399942468474767859L; - - /** - * 列名 - */ - private String columIndex; - /** - * 值 - */ - private String value; - - /** - * 过滤类型 - */ - private String type; - - /** - * 模糊搜索 - */ - private Like like; - - /** - * 关联条件 - */ - private String connectCondition; - - /** - * sql条件 - */ - private String sql; - - - public String getColumIndex() { - return columIndex; - } - - public void setColumIndex(String columIndex) { - this.columIndex = columIndex; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public Like getLike() { - return like; - } - - public void setLike(Like like) { - this.like = like; - } - - public String getConnectCondition() { - return connectCondition; - } - - public void setConnectCondition(String connectCondition) { - this.connectCondition = connectCondition; - } - - public String getSql() { - return sql; - } - - public void setSql(String sql) { - this.sql = sql; - } -} diff --git a/src/com/engine/salary/elog/entity/dto/Like.java b/src/com/engine/salary/elog/entity/dto/Like.java deleted file mode 100644 index 2caead76c..000000000 --- a/src/com/engine/salary/elog/entity/dto/Like.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import java.io.Serializable; - -/** - * @date: 2021/6/1 17:50 - * @author: deli.xu - * @description: - */ -public class Like implements Serializable { - private static final long serialVersionUID = -3399942468474767851L; - private String prefix; - private String suffix; - - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public String getSuffix() { - return suffix; - } - - public void setSuffix(String suffix) { - this.suffix = suffix; - } -} diff --git a/src/com/engine/salary/elog/entity/dto/LoggerContext.java b/src/com/engine/salary/elog/entity/dto/LoggerContext.java deleted file mode 100644 index f9be10c8f..000000000 --- a/src/com/engine/salary/elog/entity/dto/LoggerContext.java +++ /dev/null @@ -1,890 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import com.alibaba.fastjson.annotation.JSONField; -import com.engine.salary.elog.annotation.ElogField; -import com.engine.salary.elog.annotation.ElogTable; -import com.engine.salary.elog.enums.ElogConsts; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.apache.commons.lang3.StringUtils; -import weaver.hrm.User; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: LoggerContext - * @Description 日志实体类。支持通过泛型扩展日志字段 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -@ElogTable(module = ElogConsts.BASE_TABLE) -@ApiModel("日志实体类") -public class LoggerContext implements Serializable { - - private static final long serialVersionUID = 15869325700230992L; - - private User user; - - @ElogField(comment = "ID", dataType = DataTypeEnum.BIGINT, isKey = true) - @ApiModelProperty("日志ID") - private long id; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36, comment = "日志UUID") - @ApiModelProperty("日志UUID") - private String uuid = ""; - - @ApiModelProperty("自定义日志字段信息") - private T customInfo; - @ElogField(dataType = DataTypeEnum.DATETIME, comment = "操作时间") - @ApiModelProperty("操作时间") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date date = new Date(); - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 500, comment = "终端信息") - @ApiModelProperty("终端信息") - private String device = ""; - - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "操作人") - @ApiModelProperty("操作人") - private String operator = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "操作人姓名") - @ApiModelProperty("操作人姓名") - private String operatorName = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 10, comment = "租户id") - @ApiModelProperty("租户id") - private String tenant_key = ""; - - /** - * 要操作的对象在表中的主键值 - */ - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "操作目标id") - @ApiModelProperty("操作目标id") - private String targetId = ""; - - @ElogField(dataType = DataTypeEnum.TEXT, comment = "操作目标名称") - @ApiModelProperty("操作目标名称（用于显示）") - private String targetName = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "模块") - @ApiModelProperty("目标对象类型（大分类，模块，服务）") - private String moduleName;// 模块 - - /** - * 目标对象类型（小分类，模块/服务下的子功能。子项目） - * 数据存储是以模块名_子项目名作为最基本的存储单元 - * 如果是子项目下的子项目 命名为：子项目名_子项目名_子项目名（全部小写） - */ - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "服务（方法）") - @ApiModelProperty("目标对象类型（小分类，模块/服务下的子功能。子项目）") - private String functionName; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "访问接口名") - @ApiModelProperty("访问接口名") - private String interfaceName = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "请求全路径") - @ApiModelProperty("请求全路径") - private String requestUrl = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "请求地址") - @ApiModelProperty("请求地址") - private String requestUri = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50, comment = "操作类型") - @ApiModelProperty("操作类型（增删改查等）") - private String operateType = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, comment = "操作类型名称") - @ApiModelProperty("操作类型名称") - private String operateTypeName = ""; - - /** - * 每个TableChangeBean 为一张表，支持记录多张表的前后值 - */ - @ApiModelProperty("修改前、后的值") - private List changeValues;// 操作表名,[字段名,值] - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 3000, comment = "操作详细说明") - @ApiModelProperty("操作详细说明") - private String operatedesc = ""; - - @ElogField(dataType = DataTypeEnum.LONGTEXT, comment = "涉及的相关参数") - @ApiModelProperty("涉及的相关参数") - private Map params; - - @ApiModelProperty("涉及的相关参数-转string存储") - private String paramsStr; - - /** - * 当作为主表，belongMainId不赋值 - */ - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36, comment = "所属主表uuid") - @ApiModelProperty("所属主表uuid") - private String belongMainId = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50, comment = "操作IP") - @ApiModelProperty("操作IP") - private String clientIp = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50, comment = "分组") - @ApiModelProperty("分组") - private String groupId = ""; - - /*@ApiModelProperty("是否明显表") - private boolean isDetail;*/ - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 1000, comment = "分组标题") - @ApiModelProperty("分组标题") - private String groupNameLabel = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "重做业务接口") - @ApiModelProperty("重做业务接口") - private String redoService = ""; - - @ElogField(dataType = DataTypeEnum.LONGTEXT, comment = "重做参数") - @ApiModelProperty("重做参数") - private RedoContext redoContext; - - @ApiModelProperty("重做参数-转String存储") - private String redoContextStr; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "撤销业务接口") - @ApiModelProperty("撤销业务接口") - private String cancelService = ""; - - @ElogField(dataType = DataTypeEnum.LONGTEXT, comment = "撤销参数") - @ApiModelProperty("撤销参数") - private CancelContext cancelContext; - - @ApiModelProperty("撤销参数-转String存储") - private String cancelContextStr; - - @ApiModelProperty("日志明细列表（值变化列表-自动赋值、或者自定义字段）") - private List detailContexts; - - @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "创建时间") - @ApiModelProperty("创建时间") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date create_time; - - @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "修改时间") - @ApiModelProperty("修改时间") - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date update_time; - - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "创建人id") - @ApiModelProperty("创建人id") - private long creator; - - @ElogField(dataType = DataTypeEnum.INT, defaultValue = "0", comment = "是否删除") - @ApiModelProperty("是否删除") - private int delete_type; - - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "总运行时长") - @ApiModelProperty("总运行时长") - private long totalRunTime; - - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "主方法运行时长") - @ApiModelProperty("主方法运行时长") - private long mainRunTime; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, defaultValue = "", comment = "运行结果标识") - @ApiModelProperty("运行结果标识") - private String result = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 100, defaultValue = "", comment = "来自pc web") - @ApiModelProperty("来自终端") - private String fromTerminal = ""; - - @ElogField(dataType = DataTypeEnum.TEXT, comment = "运行结果描述") - @ApiModelProperty("运行结果描述") - private String resultDesc = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 3000, comment = "原先内容") - @ApiModelProperty("原先内容（et用）") - private String old_content = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 20, comment = "链接类型") - @ApiModelProperty("链接类型（et用）") - private String link_type = ""; - - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "链接id") - @ApiModelProperty("链接id（et用）") - private long link_id; - - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "0", comment = "原先链接id") - @ApiModelProperty("原先链接id（et用）") - private long old_link_id; - - /** - * 开发可以自由传中间临时参数，不会入库 - */ - @ApiModelProperty("临时参数") - private Object tempParams; - - /** - * 是否忽略该日志，不进行数据记录 - */ - @ApiModelProperty("是否忽略该日志，不进行数据记录") - private boolean logIgnore; - - /** - * 审计操作类型 - */ - @ApiModelProperty("审计操作类型") - protected String operateAuditType; - - /** - * 操作人账号 - */ - @ApiModelProperty("操作人账号") - protected String operateAccount; - - @ApiModelProperty("操作人id（兼容数据库用）") - protected long logOperator; - - @ApiModelProperty("操作人id（兼容数据库用）") - protected long logTargetid; - - @ApiModelProperty("ES存储大字段功能标识") - protected Boolean esFunction; - - @ApiModelProperty("params参数是否忽略记录") - private Boolean paramsIgnore = Boolean.FALSE; - - @ApiModelProperty("params请求体keys") - private List paramsBodyKeys; - - @ApiModelProperty("日志弱控记录") - private Boolean weakElogReocrd = Boolean.FALSE; - - private List clobFieldList; - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - public List getClobFieldList() { - return clobFieldList; - } - - public void setClobFieldList(List clobFieldList) { - this.clobFieldList = clobFieldList; - } - - public Boolean getWeakElogReocrd() { - return weakElogReocrd; - } - - public void setWeakElogReocrd(Boolean weakElogReocrd) { - this.weakElogReocrd = weakElogReocrd; - } - - public Boolean getParamsIgnore() { - return paramsIgnore; - } - - public void setParamsIgnore(Boolean paramsIgnore) { - this.paramsIgnore = paramsIgnore; - } - - public List getParamsBodyKeys() { - return paramsBodyKeys; - } - - public void setParamsBodyKeys(List paramsBodyKeys) { - this.paramsBodyKeys = paramsBodyKeys; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public T getCustomInfo() { - return customInfo; - } - - public void setCustomInfo(T customInfo) { - this.customInfo = customInfo; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public String getDevice() { - return device; - } - - public void setDevice(String device) { - this.device = device; - } - - public String getOperator() { - return operator; - } - - public void setOperator(String operator) { - this.operator = operator; - } - - public String getTenant_key() { - return tenant_key; - } - - public void setTenant_key(String tenant_key) { - this.tenant_key = tenant_key; - } - - public String getTargetId() { - return targetId; - } - - public void setTargetId(String targetId) { - this.targetId = targetId; - } - - public String getTargetName() { - return targetName; - } - - public void setTargetName(String targetName) { - this.targetName = targetName; - } - - public String getModuleName() { - return moduleName; - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - - public String getFunctionName() { - return functionName; - } - - public void setFunctionName(String functionName) { - this.functionName = functionName; - } - - public String getInterfaceName() { - return interfaceName; - } - - public void setInterfaceName(String interfaceName) { - this.interfaceName = interfaceName; - } - - public String getOperateType() { - return operateType; - } - - public void setOperateType(String operateType) { - this.operateType = operateType; - } - - public List getChangeValues() { - return changeValues; - } - - public void setChangeValues(List changeValues) { - this.changeValues = changeValues; - } - - public String getOperatedesc() { - return operatedesc; - } - - public void setOperatedesc(String operatedesc) { - this.operatedesc = operatedesc; - } - - public Map getParams() { - return params; - } - - public void setParams(Map params) { - this.params = params; - } - - /*public String getMainId() { - return mainId; - } - - public void setMainId(String mainId) { - this.mainId = mainId; - } - - public String getBelongMainId() { - return belongMainId; - } - - public void setBelongMainId(String belongMainId) { - this.belongMainId = belongMainId; - }*/ - - public String getClientIp() { - return clientIp; - } - - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - -/* public boolean isDetail() { - return isDetail; - } - - public void setDetail(boolean detail) { - isDetail = detail; - }*/ - - public String getGroupNameLabel() { - return groupNameLabel; - } - - public void setGroupNameLabel(String groupNameLabel) { - this.groupNameLabel = groupNameLabel; - } - - public String getRedoService() { - return redoService; - } - - public void setRedoService(String redoService) { - this.redoService = redoService; - } - - public RedoContext getRedoContext() { - return redoContext; - } - - public void setRedoContext(RedoContext redoContext) { - this.redoContext = redoContext; - } - - public CancelContext getCancelContext() { - return cancelContext; - } - - public void setCancelContext(CancelContext cancelContext) { - this.cancelContext = cancelContext; - } - - public String getCancelService() { - return cancelService; - } - - public void setCancelService(String cancelService) { - this.cancelService = cancelService; - } - - public List getDetailContexts() { - return detailContexts; - } - - public void setDetailContexts(List detailContexts) { - this.detailContexts = detailContexts; - } - - public void addDetailContext(LoggerDetailContext loggerDetailContext) { - if (this.detailContexts != null) { - this.detailContexts.add(loggerDetailContext); - } else { - this.detailContexts = new ArrayList<>(); - this.detailContexts.add(loggerDetailContext); - } - } - - public void addDetailContext(List list) { - if (this.detailContexts != null) { - this.detailContexts.addAll(list); - } else { - this.detailContexts = new ArrayList<>(); - this.detailContexts.addAll(list); - } - } - - public String getOperatorName() { - return operatorName; - } - - public void setOperatorName(String operatorName) { - this.operatorName = operatorName; - } - - public void setOldValues(Object object) { - TableChangeBean bean = new TableChangeBean(); - bean.setOldValue(object); - getChangeList().add(bean); - } - - public void setOldValueList(List list) { - if (list != null) - list.stream().forEach(obj -> setOldValues(obj)); - } - - public void setNewValueList(List list) { - if (list != null) - list.stream().forEach(obj -> setNewValues(obj)); - } - - public void setNewValues(Object object) { - List list = getChangeList(); - - boolean handled = false; - for (TableChangeBean bean : list) { - if (bean.getNewValue() == null) { - bean.setNewValue(object); - handled = true; - break; - } - } - if (!handled) { - TableChangeBean bean = new TableChangeBean(); - bean.setNewValue(object); - list.add(bean); - } - } - - public void setOldValues(Object object, String tableName, String dataId, String belongDataid) { - setOldValues(object, tableName, dataId, belongDataid, false); - } - - public void setOldValues(Object object, String tableName, String dataId, String belongDataid, boolean isDetail) { - TableChangeBean bean = new TableChangeBean(); - if (StringUtils.isNotEmpty(tableName)) - bean.setTableName(tableName); - if (StringUtils.isNotEmpty(dataId)) - bean.setDataid(dataId); - if (StringUtils.isNotEmpty(belongDataid)) - bean.setBelongDataid(belongDataid); - if (isDetail) - bean.setIsDetail(1); - bean.setOldValue(object); - getChangeList().add(bean); - } - - public void setOldValueList(List list, String tableName, String dataId, String belongDataid) { - setOldValueList(list, tableName, dataId, belongDataid, false); - } - - public void setNewValueList(List list, String tableName, String dataId, String belongDataid) { - setNewValueList(list, tableName, dataId, belongDataid, false); - } - - public void setOldValueList(List list, String tableName, String dataId, String belongDataid, boolean isDetail) { - if (list != null) - list.stream().forEach(obj -> setOldValues(obj, tableName, dataId, belongDataid, isDetail)); - } - - public void setNewValueList(List list, String tableName, String dataId, String belongDataid, boolean isDetail) { - if (list != null) - list.stream().forEach(obj -> setNewValues(obj, tableName, dataId, belongDataid, isDetail)); - } - - public void setNewValues(Object object, String tableName, String dataId, String belongDataid) { - setNewValues(object, tableName, dataId, belongDataid, false); - } - - public void setNewValues(Object object, String tableName, String dataId, String belongDataid, boolean isDetail) { - List list = getChangeList(); - - boolean handled = false; - for (TableChangeBean bean : list) { - if (bean.getNewValue() == null) { - bean.setNewValue(object); - if (StringUtils.isNotEmpty(tableName)) - bean.setTableName(tableName); - if (StringUtils.isNotEmpty(dataId)) - bean.setDataid(dataId); - if (StringUtils.isNotEmpty(belongDataid)) - bean.setBelongDataid(belongDataid); - if (isDetail) - bean.setIsDetail(1); - handled = true; - break; - } - } - if (!handled) { - TableChangeBean bean = new TableChangeBean(); - if (StringUtils.isNotEmpty(tableName)) - bean.setTableName(tableName); - if (StringUtils.isNotEmpty(dataId)) - bean.setDataid(dataId); - if (StringUtils.isNotEmpty(belongDataid)) - bean.setBelongDataid(belongDataid); - if (isDetail) - bean.setIsDetail(1); - bean.setNewValue(object); - list.add(bean); - } - } - - public List getChangeList() { - - if (this.changeValues == null) { - this.changeValues = new ArrayList<>(); - } - - return this.changeValues; - - } - - public Object getParam(String id) { - return this.params.get(id); - } - - public String getOperateTypeName() { - return operateTypeName; - } - - public void setOperateTypeName(String operateTypeName) { - this.operateTypeName = operateTypeName; - } - - public String getParamsStr() { - return paramsStr; - } - - public void setParamsStr(String paramsStr) { - this.paramsStr = paramsStr; - } - - public String getRedoContextStr() { - return redoContextStr; - } - - public void setRedoContextStr(String redoContextStr) { - this.redoContextStr = redoContextStr; - } - - public String getCancelContextStr() { - return cancelContextStr; - } - - public void setCancelContextStr(String cancelContextStr) { - this.cancelContextStr = cancelContextStr; - } - - public String getBelongMainId() { - return belongMainId; - } - - public void setBelongMainId(String belongMainId) { - this.belongMainId = belongMainId; - } - - public String getRequestUrl() { - return requestUrl; - } - - public void setRequestUrl(String requestUrl) { - this.requestUrl = requestUrl; - } - - public String getRequestUri() { - return requestUri; - } - - public void setRequestUri(String requestUri) { - this.requestUri = requestUri; - } - - public Date getCreate_time() { - return create_time; - } - - public void setCreate_time(Date create_time) { - this.create_time = create_time; - } - - public Date getUpdate_time() { - return update_time; - } - - public void setUpdate_time(Date update_time) { - this.update_time = update_time; - } - - public long getCreator() { - return creator; - } - - public void setCreator(long creator) { - this.creator = creator; - } - - public int getDelete_type() { - return delete_type; - } - - public void setDelete_type(int delete_type) { - this.delete_type = delete_type; - } - - public long getTotalRunTime() { - return totalRunTime; - } - - public void setTotalRunTime(long totalRunTime) { - this.totalRunTime = totalRunTime; - } - - public long getMainRunTime() { - return mainRunTime; - } - - public void setMainRunTime(long mainRunTime) { - this.mainRunTime = mainRunTime; - } - - public Object getTempParams() { - return tempParams; - } - - public void setTempParams(Object tempParams) { - this.tempParams = tempParams; - } - - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result; - } - - public String getFromTerminal() { - return fromTerminal; - } - - public void setFromTerminal(String fromTerminal) { - this.fromTerminal = fromTerminal; - } - - public String getResultDesc() { - return resultDesc; - } - - public void setResultDesc(String resultDesc) { - this.resultDesc = resultDesc; - } - - public String getOld_content() { - return old_content; - } - - public void setOld_content(String old_content) { - this.old_content = old_content; - } - - public String getLink_type() { - return link_type; - } - - public void setLink_type(String link_type) { - this.link_type = link_type; - } - - public long getLink_id() { - return link_id; - } - - public void setLink_id(long link_id) { - this.link_id = link_id; - } - - public long getOld_link_id() { - return old_link_id; - } - - public void setOld_link_id(long old_link_id) { - this.old_link_id = old_link_id; - } - - public String getOperateAuditType() { - return operateAuditType; - } - - public void setOperateAuditType(String operateAuditType) { - this.operateAuditType = operateAuditType; - } - - public String getOperateAccount() { - return operateAccount; - } - - public void setOperateAccount(String operateAccount) { - this.operateAccount = operateAccount; - } - - public long getLogOperator() { - return logOperator; - } - - public void setLogOperator(long logOperator) { - this.logOperator = logOperator; - } - - public long getLogTargetid() { - return logTargetid; - } - - public void setLogTargetid(long logTargetid) { - this.logTargetid = logTargetid; - } - - public boolean getLogIgnore() { - return logIgnore; - } - - public void setLogIgnore(boolean logIgnore) { - this.logIgnore = logIgnore; - } - - public Boolean getEsFunction() { - return esFunction; - } - - public void setEsFunction(Boolean esFunction) { - this.esFunction = esFunction; - } - -} - diff --git a/src/com/engine/salary/elog/entity/dto/LoggerDetailContext.java b/src/com/engine/salary/elog/entity/dto/LoggerDetailContext.java deleted file mode 100644 index ef4a66503..000000000 --- a/src/com/engine/salary/elog/entity/dto/LoggerDetailContext.java +++ /dev/null @@ -1,316 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import com.engine.salary.elog.annotation.ElogDetailTable; -import com.engine.salary.elog.annotation.ElogField; -import com.engine.salary.elog.enums.ElogConsts; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - -/** - * @ClassName: ValueChangeBean - * @Description 值变化实体类（自动将表字段值变更类转换为该类） - * @Author tanghj - * @Date 2021/3/9 11:06 - */ -@ElogDetailTable(module = ElogConsts.BASE_TABLE) -@ApiModel("值变化实体类") -public class LoggerDetailContext implements Serializable { - - private static final long serialVersionUID = 15869325700230992L; - - @ElogField(comment = "ID", dataType = DataTypeEnum.BIGINT, isKey = true) - @ApiModelProperty("ID") - private long id; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36,comment = "日志UUID") - @ApiModelProperty("同一个bean转换的数据，uuid相同，作为区分标识") - private String uuid = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 36,comment = "主表id") - @ApiModelProperty("主表id") - private String mainid = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50,comment = "数据id") - @ApiModelProperty("数据id") - private String dataid = ""; - - /** - * 当作为主表，belongDataId不赋值 - */ - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 50,comment = "主表数据id") - @ApiModelProperty("主表数据id") - private String belongDataid = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200,comment = "表名") - @ApiModelProperty("表名") - private String tableName =""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, defaultValue = "-1", length = 50,comment = "表名labelid") - @ApiModelProperty("表名labelid") - private String tableNameLabelId = "-1"; - @ElogField(dataType = DataTypeEnum.VARCHAR, defaultValue="",isNull = false,length = 50,comment = "对应数据库的表") - @ApiModelProperty("对应数据库的表") - private String tableNameDesc = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200,comment = "字段名") - @ApiModelProperty("字段名") - private String fieldName =""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, defaultValue = "-1", length = 50,comment = "字段名labelid") - @ApiModelProperty("字段名labelid") - private String fieldNameLabelId = "-1"; - - @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新后的值") - @ApiModelProperty("更新后的值") - private String newValue = ""; - - @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新前的值") - @ApiModelProperty("更新前的值") - private String oldValue = ""; - - @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新后的显示值") - @ApiModelProperty("更新后的显示值") - private String newRealValue = ""; - - @ElogField(dataType = DataTypeEnum.LONGTEXT,comment = "更新前的显示值") - @ApiModelProperty("更新前的显示值") - private String oldRealValue = ""; - - @ElogField(dataType = DataTypeEnum.VARCHAR, length = 200, comment = "字段名") - @ApiModelProperty("字段描述") - private String fieldDesc = ""; - - @ElogField(dataType = DataTypeEnum.INT, comment = "字段名") - @ApiModelProperty("字段展示顺序") - private int showorder = 0; - - @ApiModelProperty("自定义字段") - private T customDetailInfo; - - @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "创建时间") - @ApiModelProperty("创建时间") - private Date create_time; - - @ElogField(dataType = DataTypeEnum.DATETIME, defaultValue = "CURRENT_TIMESTAMP", comment = "修改时间") - @ApiModelProperty("修改时间") - private Date update_time; - - @ElogField(dataType = DataTypeEnum.BIGINT, defaultValue = "-1", comment = "创建人id") - @ApiModelProperty("创建人id") - private long creator; - - @ElogField(dataType = DataTypeEnum.INT, defaultValue = "0" , comment = "是否删除") - @ApiModelProperty("是否删除") - private int delete_type; - - @ElogField(dataType = DataTypeEnum.VARCHAR,length = 10,comment = "租户id") - @ApiModelProperty("租户id") - private String tenant_key = ""; - - @ElogField(dataType = DataTypeEnum.INT, defaultValue = "0" , comment = "是否明细字段") - @ApiModelProperty("是否明细字段") - private int isDetail = 0; - - - private String cusValus; - - public String getCusValus() { - return cusValus; - } - - public void setCusValus(String cusValus) { - this.cusValus = cusValus; - } - - - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getMainid() { - return mainid; - } - - public void setMainid(String mainid) { - this.mainid = mainid; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public String getFieldName() { - return fieldName; - } - - public void setFieldName(String fieldName) { - this.fieldName = fieldName; - } - - public String getNewValue() { - return newValue; - } - - public void setNewValue(String newValue) { - this.newValue = newValue; - } - - public String getOldValue() { - return oldValue; - } - - public void setOldValue(String oldValue) { - this.oldValue = oldValue; - } - - public String getFieldDesc() { - return fieldDesc; - } - - public void setFieldDesc(String fieldDesc) { - this.fieldDesc = fieldDesc; - } - - public int getShoworder() { - return showorder; - } - - public void setShoworder(int showorder) { - this.showorder = showorder; - } - - public T getCustomDetailInfo() { - return customDetailInfo; - } - - public void setCustomDetailInfo(T customDetailInfo) { - this.customDetailInfo = customDetailInfo; - } - - public String getDataid() { - return dataid; - } - - public void setDataid(String dataid) { - this.dataid = dataid; - } - - public String getBelongDataid() { - return belongDataid; - } - - public void setBelongDataid(String belongDataid) { - this.belongDataid = belongDataid; - } - - public Date getCreate_time() { - return create_time; - } - - public void setCreate_time(Date create_time) { - this.create_time = create_time; - } - - public Date getUpdate_time() { - return update_time; - } - - public void setUpdate_time(Date update_time) { - this.update_time = update_time; - } - - public long getCreator() { - return creator; - } - - public void setCreator(long creator) { - this.creator = creator; - } - - public int getDelete_type() { - return delete_type; - } - - public void setDelete_type(int delete_type) { - this.delete_type = delete_type; - } - - public String getTenant_key() { - return tenant_key; - } - - public void setTenant_key(String tenant_key) { - this.tenant_key = tenant_key; - } - - public int getIsDetail() { - return isDetail; - } - - public void setIsDetail(int isDetail) { - this.isDetail = isDetail; - } - - public String getNewRealValue() { - return newRealValue; - } - - public void setNewRealValue(String newRealValue) { - this.newRealValue = newRealValue; - } - - public String getOldRealValue() { - return oldRealValue; - } - - public void setOldRealValue(String oldRealValue) { - this.oldRealValue = oldRealValue; - } - - public String getTableNameLabelId() { - return tableNameLabelId; - } - - public void setTableNameLabelId(String tableNameLabelId) { - this.tableNameLabelId = tableNameLabelId; - } - - public String getFieldNameLabelId() { - return fieldNameLabelId; - } - - public void setFieldNameLabelId(String fieldNameLabelId) { - this.fieldNameLabelId = fieldNameLabelId; - } - - public String getTableNameDesc() { - return tableNameDesc; - } - - public void setTableNameDesc(String tableNameDesc) { - this.tableNameDesc = tableNameDesc; - } - - - -} diff --git a/src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java b/src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java deleted file mode 100644 index 3f7a364e4..000000000 --- a/src/com/engine/salary/elog/entity/dto/ReadInfoEntity.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import java.io.Serializable; -import java.util.Date; - -/** - * @date: 2022/5/14 13:52 - * @author: deli.xu - * @description: - */ - -public class ReadInfoEntity implements Serializable { - private static final long serialVersionUID = -8890667941835568289L; - private Long employeeId; - private Date date; - - public Long getEmployeeId() { - return this.employeeId; - } - - public void setEmployeeId(Long employeeId) { - this.employeeId = employeeId; - } - - public Date getDate() { - return this.date; - } - - public void setDate(Date date) { - this.date = date; - } - - public ReadInfoEntity() { - } - - public ReadInfoEntity(Long employeeId, Date date) { - this.employeeId = employeeId; - this.date = date; - } -} \ No newline at end of file diff --git a/src/com/engine/salary/elog/entity/dto/RedoContext.java b/src/com/engine/salary/elog/entity/dto/RedoContext.java deleted file mode 100644 index 3ec87adb3..000000000 --- a/src/com/engine/salary/elog/entity/dto/RedoContext.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: RedoContext - * @Description 重做实体类 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -@ApiModel("重做实体类") -public class RedoContext { - @ApiModelProperty("重做参数") - private T redoParams; - - public T getRedoParams() { - return redoParams; - } - - public void setRedoParams(T redoParams) { - this.redoParams = redoParams; - } -} diff --git a/src/com/engine/salary/elog/entity/dto/ShowColumsDto.java b/src/com/engine/salary/elog/entity/dto/ShowColumsDto.java deleted file mode 100644 index b5f47e084..000000000 --- a/src/com/engine/salary/elog/entity/dto/ShowColumsDto.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.engine.salary.elog.entity.dto; - - -import java.io.Serializable; - -/** - * @date: 2021/5/11 18:46 - * @author: deli.xu - * @description: 显示列对象 - */ -public class ShowColumsDto implements Serializable { - - private static final long serialVersionUID = 4650449925605408753L; - - /** - * 列名 - */ - private String columName; - /** - * 列别名 - */ - private String aliasColumName; - - /** - * 列名index - */ - private String columIndex; - - /** - * 是否隐藏 默认显示 - */ - private boolean isHide = false; - - /** - * 宽度 - */ - private String width; - - /** - * 是否转多语言 - */ - private boolean isTransfLanguage = false; - - /** - * 是否换行 - * @param width - */ - private boolean newLine = false; - - public void setWidth(String width){ - this.width =width; - } - - public String getWidth(){ - return width; - } - public String getColumName() { - return columName; - } - - public void setColumName(String columName) { - this.columName = columName; - } - - public String getAliasColumName() { - return aliasColumName; - } - - public void setAliasColumName(String aliasColumName) { - this.aliasColumName = aliasColumName; - } - - public boolean isHide() { - return isHide; - } - - public void setHide(boolean hide) { - isHide = hide; - } - - public String getColumIndex() { - return columIndex; - } - - public void setColumIndex(String columIndex) { - this.columIndex = columIndex; - } - - public boolean isTransfLanguage() { - return isTransfLanguage; - } - - public boolean isNewLine() { - return newLine; - } - - public void setNewLine(boolean newLine) { - this.newLine = newLine; - } - - public void setTransfLanguage(boolean transfLanguage) { - - isTransfLanguage = transfLanguage; - } -} diff --git a/src/com/engine/salary/elog/entity/dto/TableChangeBean.java b/src/com/engine/salary/elog/entity/dto/TableChangeBean.java deleted file mode 100644 index 445bd8510..000000000 --- a/src/com/engine/salary/elog/entity/dto/TableChangeBean.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - -/** - * @ClassName: TableChangeBean - * @Description 表更新前后值类 - * @Author tanghj - * @Date 2021/3/8 15:58 - */ -@ApiModel("表更新前后值类") -public class TableChangeBean implements Serializable { - - private static final long serialVersionUID = 15869325700230992L; - - @ApiModelProperty("表名") - private String tableName; - - @ApiModelProperty("数据id") - private String dataid; - - @ApiModelProperty("所属主表数据id") - private String belongDataid; - - @ApiModelProperty("是否为明细表（0,否；1，是）") - private int isDetail = 0; - - /** - * 泛型必须是具体的实体类 - */ - @ApiModelProperty("更新前的值") - private T oldValue; - - /** - * 泛型必须是具体的实体类 - */ - @ApiModelProperty("更新后的值") - private T newValue; - - /** - * 泛型必须是具体的实体类 - */ - @ApiModelProperty("更新前显示的值") - private T oldRealValue; - - /** - * 泛型必须是具体的实体类 - */ - @ApiModelProperty("更新后显示的值") - private T newRealValue; - - - @ApiModelProperty("字段对应的labelid") - private String fieldNameLabelId; - - @ApiModelProperty("表对应的labelid") - private String tableNameLabelId; - - @ApiModelProperty("对应数据库的表") - private String tableNameDesc; - - - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } - - public T getOldValue() { - return oldValue; - } - - public void setOldValue(T oldValue) { - this.oldValue = oldValue; - } - - public T getNewValue() { - return newValue; - } - - public void setNewValue(T newValue) { - this.newValue = newValue; - } - - public String getDataid() { - return dataid; - } - - public void setDataid(String dataid) { - this.dataid = dataid; - } - - public String getBelongDataid() { - return belongDataid; - } - - public void setBelongDataid(String belongDataid) { - this.belongDataid = belongDataid; - } - - public int getIsDetail() { - return isDetail; - } - - public void setIsDetail(int isDetail) { - this.isDetail = isDetail; - } - - public T getOldRealValue() { - return oldRealValue; - } - - public void setOldRealValue(T oldRealValue) { - this.oldRealValue = oldRealValue; - } - - public T getNewRealValue() { - return newRealValue; - } - - public String getFieldNameLabelId() { - return fieldNameLabelId; - } - - public void setFieldNameLabelId(String fieldNameLabelId) { - this.fieldNameLabelId = fieldNameLabelId; - } - - public String getTableNameLabelId() { - return tableNameLabelId; - } - - public void setTableNameLabelId(String tableNameLabelId) { - this.tableNameLabelId = tableNameLabelId; - } - - public String getTableNameDesc() { - return tableNameDesc; - } - - public void setTableNameDesc(String tableNameDesc) { - this.tableNameDesc = tableNameDesc; - } - - public void setNewRealValue(T newRealValue) { - this.newRealValue = newRealValue; - } -} diff --git a/src/com/engine/salary/elog/entity/dto/TableColumnBean.java b/src/com/engine/salary/elog/entity/dto/TableColumnBean.java deleted file mode 100644 index a6fdf6148..000000000 --- a/src/com/engine/salary/elog/entity/dto/TableColumnBean.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.engine.salary.elog.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: TableColumnBean - * @Description 表字段类 - * @Author tanghj - * @Date 2021/3/12 11:44 - */ -@ApiModel("表字段类") -public class TableColumnBean { - - @ApiModelProperty("列名") - private String columnName; - - /** - * varchar(20) - */ - @ApiModelProperty("数据类型") - private String columnType; - - @ApiModelProperty("字段类型-字符串") - private String dataTypeStr; - - @ApiModelProperty("字段类型") - private DataTypeEnum dataType; - - @ApiModelProperty("长度") - private long fieldLength; - - @ApiModelProperty("是否为空") - private boolean isNullable; - - @ApiModelProperty("是否为空-字符串") - private String isNullableStr; - - @ApiModelProperty("默认值") - private Object columnDefault; - - @ApiModelProperty("备注") - private String columnComment; - - public String getColumnName() { - return columnName; - } - - public void setColumnName(String columnName) { - this.columnName = columnName; - } - - public String getColumnType() { - return columnType; - } - - public void setColumnType(String columnType) { - this.columnType = columnType; - } - - public DataTypeEnum getDataType() { - return dataType; - } - - public void setDataType(DataTypeEnum dataType) { - this.dataType = dataType; - } - - public long getFieldLength() { - return fieldLength; - } - - public void setFieldLength(long fieldLength) { - this.fieldLength = fieldLength; - } - - public boolean isNullable() { - return isNullable; - } - - public void setNullable(boolean nullable) { - isNullable = nullable; - } - - public Object getColumnDefault() { - return columnDefault; - } - - public void setColumnDefault(Object columnDefault) { - this.columnDefault = columnDefault; - } - - public String getColumnComment() { - return columnComment; - } - - public void setColumnComment(String columnComment) { - this.columnComment = columnComment; - } - - public String getDataTypeStr() { - return dataTypeStr; - } - - public void setDataTypeStr(String dataTypeStr) { - this.dataTypeStr = dataTypeStr; - } - - public String getIsNullableStr() { - return isNullableStr; - } - - public void setIsNullableStr(String isNullableStr) { - this.isNullableStr = isNullableStr; - } - - public boolean equals(TableColumnBean tableColumnBean) { - - return this.toSql().equals(tableColumnBean.toSql()); - } - - public String toSql() { - - StringBuilder sb = new StringBuilder(this.columnName.toLowerCase()).append(" "); - - if (this.dataType == null) { - return "类型为空"; - } - switch (this.dataType) { - case BIGINT: - case INT: - case TEXT: - case LONGTEXT: - case DATETIME: - case FLOAT: - case TINYINT: - case DOUBLE: - sb.append(this.dataType.name().toLowerCase()).append(" "); - break; - case VARCHAR: - sb.append(this.dataType.name().toLowerCase()).append("(").append(this.fieldLength).append(") "); - break; - case DECIMAL: - long length = (this.fieldLength < 0 || this.fieldLength > 38) ? 0 : this.fieldLength; - sb.append(this.dataType.name().toLowerCase()).append("(").append(38 - length).append(",").append(length).append(") "); - break; - default: - sb.append("varchar").append("(").append(10).append(") "); - } - - sb.append("comment ").append("'").append(this.columnComment).append("' "); - - return sb.toString(); - } -} diff --git a/src/com/engine/salary/elog/entity/param/ELogGetLogParam.java b/src/com/engine/salary/elog/entity/param/ELogGetLogParam.java deleted file mode 100644 index 77132c908..000000000 --- a/src/com/engine/salary/elog/entity/param/ELogGetLogParam.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.engine.salary.elog.entity.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ELogGetLogParam { - /** - * 服务（模块）名 - */ - String module; - /** - * 方法名 - */ - String function; - /** - * 查询条件 - */ - String condition; - /** - * 每页多少数据 - */ - String pageSize; - /** - * ' - * 当前页 - */ - String current; - -} diff --git a/src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java b/src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java deleted file mode 100644 index aec15823d..000000000 --- a/src/com/engine/salary/elog/entity/param/GetDetailChangesParam.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.engine.salary.elog.entity.param; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class GetDetailChangesParam { - /** - * 服务（模块）名 - */ - String module; - /** - * 方法名 - */ - String function; - /** - * 主键id - */ - String mainid; - /** - * 转换方法 - */ - String detailTransMethod; -} diff --git a/src/com/engine/salary/elog/enums/ElogConsts.java b/src/com/engine/salary/elog/enums/ElogConsts.java deleted file mode 100644 index a895b95b8..000000000 --- a/src/com/engine/salary/elog/enums/ElogConsts.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.engine.salary.elog.enums; - -/** - * @date: 2022/3/30 20:32 - * @author: deli.xu - * @description: 日志常量 - */ -public class ElogConsts { - - public static final String ORACLE = "oracle"; - public static final String SQLSERVER = "sqlserver"; - public static final String MYSQL = "mysql"; - public static final String POSTGRESQL = "postgresql"; - - public static final String BASE_TABLE = "BASE_ELOG_TABLE"; - - public static final String TABLE_SPACER = "_"; - public static final String TABLE_SUFFIX = "logs"; - public static final String DETAIL_TABLE_SUFFIX = "_detail"; - - public static final String ES = "ES"; -} diff --git a/src/com/engine/salary/elog/enums/FromTerminalType.java b/src/com/engine/salary/elog/enums/FromTerminalType.java deleted file mode 100644 index d637bb0f9..000000000 --- a/src/com/engine/salary/elog/enums/FromTerminalType.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.engine.salary.elog.enums; - -/** - * @ClassName: FromTerminalType - * @Description TODO - * @Author tanghj - * @Date 2021/6/8 11:35 - */ -public enum FromTerminalType { - PC("pc","来自 pc web"), - ANDROID("android","来自 安卓"), - IOS("ios","来自 iphone"), - IPHONE("iphone","来自 iphone"), - PC_CLIENT("pc_client","来自 windows客户端"), - MAC_CLIENT("mac_client","来自 mac客户端"), - H5("H5","来自 手机H5"), - MOBILEWEB("mobileWeb","来自 手机H5"), - MICO_MSG("mico_msg","来自 微信"), - WECHAT("wechat","来自 企业微信"), - APP_H5("app_h5","来自 app_h5"), - BROWSER("browser", "来自 网页"), - MOBILE("mobile","来自 移动端"); - - private String code; - private String face; - - FromTerminalType(String code, String face) { - this.code = code; - this.face = face; - } - - public String getCode() { - return code; - } - - public String getFace() { - return face; - } - - public static FromTerminalType fromString(String name) { - try { - FromTerminalType type = FromTerminalType.valueOf(name); - return type; - } catch (Exception e) { - return null; - } - } -} diff --git a/src/com/engine/salary/elog/enums/LinkType.java b/src/com/engine/salary/elog/enums/LinkType.java deleted file mode 100644 index ff78362f0..000000000 --- a/src/com/engine/salary/elog/enums/LinkType.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.engine.salary.elog.enums; - -/** - * @date: 2022/5/13 21:13 - * @author: deli.xu - * @description: 链接类型 用之前老eteams-base-bean - */ - -/** - * 链接类型 - * - * @author gk - */ -public enum LinkType { - - // 主线 - mainline("项目"), - - blog("工作日报"), - - workreport("计划报告"), - - clue("线索"), - - crmcontact("联系人-用于全局搜索"), - - marketactivity("活动"), - - crmSummary("报表"), - - statisticalReport("统计报表"), - - attend("出勤"), - - singalForm("表单应用"), - - biaoge("表格"), - - // 标签 - tag("标签"), - - // 表单标签 - formtag("表单标签"), - - // 附件 - attachment("附件"), - - // 用户 - user("用户"), - - // 任务 - task("任务"), - - // 子任务 - subtask("子任务"), - - // 文档 - document("文档"), - - // 文件夹 - folder("文件夹"), - - // 客户 - customer("客户"), - - // 联系人 - contact("联系人"), - - // 销售商机 - saleChance("销售商机"), - - // 产品 - production("产品"), - - // 合同 - contract("合同"), - - // 竞争对手 - competitor("竞争对手"), - - // 公告 - placard("公告"), - - // 审批 - workflow("审批"), - - // 部门 - department("部门"), - - // 岗位 - position("岗位"), - - // 日程 - calendar("日程"), - - // 群组 - group("群组"), - - // 合同 - hrcontract("人事合同"), - - //人事管理 - hr("人事"), - - //KPI - kpi("绩效考核"),kpiFlow("绩效考核流程"), - - // 全部 - all("所有人"), - - formdatareport("数据上报"), - - form("表单"), - - userSetting("不可见成员"), - - sms("短信"), - - wechatEnterprise("企业微信"), - - wechatService("微信服务号"), - - salarybill("工资单"), - - staffPosition("员工位置")/*定制化模块*/, - - app("应用")/*自定义应用*/, - - email("邮件"), - - workTrends("工作动态"), - - tenantLogo("个性化定制"), - - module("模块"), - - orderform("订单"), - - price("价格"), - - capital("资金"), - - quote("报价"), - - room("会议室管理"), - - //模板任务 - mtTask("模板任务"), - - watchMe("关注我的"), - // crm - crm("CRM"), - - // 空 - blank(""), - - role("角色"), - - externalUser("外部联系人"), - - subcompany("分部"); - - private String displayName; - - LinkType(String displayName) { - this.displayName = displayName; - } - - public String getDisplayName() { - return displayName; - } - -} diff --git a/src/com/engine/salary/elog/enums/OperateAuditType.java b/src/com/engine/salary/elog/enums/OperateAuditType.java deleted file mode 100644 index 5d3850c38..000000000 --- a/src/com/engine/salary/elog/enums/OperateAuditType.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.engine.salary.elog.enums; - -public class OperateAuditType { - //自动 - public static final String AUTO = "AUTO"; - //信息 - public static final String INFO = "INFO"; - //错误 - public static final String ERROR = "ERROR"; - //警告 - public static final String WARNING = "WARNING"; - //重大事件 - public static final String EVENT = "EVENT"; -} \ No newline at end of file diff --git a/src/com/engine/salary/elog/service/ILocalElogService.java b/src/com/engine/salary/elog/service/ILocalElogService.java deleted file mode 100644 index af12b54c8..000000000 --- a/src/com/engine/salary/elog/service/ILocalElogService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.engine.salary.elog.service; - -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.entity.dto.LoggerDetailContext; - -public interface ILocalElogService { - - int insertLocalElog(LoggerContext context); - - int insertElogDetail(LoggerDetailContext loggerDetailContext, String mainId, String detailTableName); - -// void rollBackElog(LoggerContext context); -} diff --git a/src/com/engine/salary/elog/service/ILoggerTableService.java b/src/com/engine/salary/elog/service/ILoggerTableService.java deleted file mode 100644 index 8657f0ea6..000000000 --- a/src/com/engine/salary/elog/service/ILoggerTableService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.engine.salary.elog.service; - -import com.cloudstore.eccom.pc.table.WeaTable; -import com.engine.salary.elog.entity.param.ELogGetLogParam; -import com.engine.salary.elog.entity.param.GetDetailChangesParam; -import com.engine.salary.util.page.PageInfo; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -public interface ILoggerTableService { - PageInfo queryLogs(String data); - - WeaTable queryLogsPapi(String data, HttpServletRequest request); - - List getDetailChanges(GetDetailChangesParam param); - - List getDetailChangesPapi(String module, String function, String mainid, String transMethod, HttpServletRequest request); - - List queryLogList(ELogGetLogParam param); - - List queryCardLogList(String data); - - Map countLog(String module, String function); - - List queryDetailLogList(String module, String function, String current, String pageSize, String condition, String mainId); - - Map countDestailLog(String module, String function, String mainId); - - WeaTable queryElogTraceInfo(String traceId, String module, String function, Integer currentPage, Integer pageSize,String traceTransMethod); - - List queryLogInfoByCustom(String module, String function, String field, String value, boolean isDetail); - - List queryLogInfoByCustom(String module, String function, String field, String value); - -// BatchDocumentMessage downloadLog(String data); - - WeaTable getDetailChangePages(String module, String function, String mainid, String detailTransMethod, String current, String pageSize); - -} diff --git a/src/com/engine/salary/elog/service/impl/LocalElogService.java b/src/com/engine/salary/elog/service/impl/LocalElogService.java deleted file mode 100644 index 404bea1db..000000000 --- a/src/com/engine/salary/elog/service/impl/LocalElogService.java +++ /dev/null @@ -1,435 +0,0 @@ -package com.engine.salary.elog.service.impl; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.entity.dto.LoggerDetailContext; -import com.engine.salary.elog.enums.ElogConsts; -import com.engine.salary.elog.service.ILocalElogService; -import com.engine.salary.elog.util.ElogUtils; -import com.engine.salary.mapper.elog.LocalElogAopDaoMapper; -import com.engine.salary.util.db.IdGenerator; -import com.engine.salary.util.db.MapperProxyFactory; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.util.CollectionUtils; -import weaver.conn.RecordSet; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import java.util.*; - -/** - * @ClassName: LocalElogService - * @Description 日志本地持久化 - * @Author tanghj - * @Date 2021/2/24 11:03 - */ -public class LocalElogService implements ILocalElogService { - - private static final Logger logger = LoggerFactory.getLogger(LocalElogService.class); - - private LocalElogAopDaoMapper getLocalElogAopDaoMapper() { - return MapperProxyFactory.getProxy(LocalElogAopDaoMapper.class); - } - -// private RestHighLevelClient client; -// -// private LazyRollBack lazyRollBack; - - //数据库类型 - private static final String databaseId = new RecordSet().getDBType(); - - /** - * @param context - * @param - * @return - */ - @Override - public int insertLocalElog(LoggerContext context) { -// logger.error("接收到的数据，context:{}",JSONObject.toJSONString(context)); -// logger.info("接收到数据的时间：log_date:{}",context.getDate()); - if (StringUtils.isEmpty(context.getUuid())) { - context.setUuid(UUID.randomUUID().toString().replace("-", "")); - } - - String cusColumns = ""; - String cusValus = ""; - if (context.getCustomInfo() != null) { - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(context.getCustomInfo())); - List clobFieldList = context.getClobFieldList(); - for (String key : (Set) custom.keySet()) { - cusColumns = cusColumns + ", " + key; - String keystr = custom.getString(key); - //如果keystr包含单引号，将单引号去掉 - if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { - keystr = keystr.replace("'", "''"); - } - //如果是Oracle数据库 - if (ElogConsts.ORACLE.equals(databaseId)) { - //clob字段集合不为空且包含此字段 - if (!CollectionUtils.isEmpty(clobFieldList) && clobFieldList.contains(key)) { - String clobColumnStr = ElogUtils.handleClobColumn(keystr); - cusValus = cusValus + ",TO_CLOB( " + clobColumnStr + " )"; - } else if (checkStrIsDate(keystr)) { - //并且字符串为时间类型格式 则进行特殊处理 - cusValus = cusValus + ",TO_DATE('" + keystr + "', 'SYYYY-MM-DD HH24:MI:SS')"; - } else { - cusValus = cusValus + ",'" + keystr + "'"; - } - } else { - cusValus = cusValus + ",'" + keystr + "'"; - } - } - - } - - normalizationContext(context); - - String tableName = context.getModuleName() + "_" + context.getFunctionName() + "logs"; - //context.setId(IdGenerator.generate()); - Integer id = getLocalElogAopDaoMapper().queryElogContextById(context.getId(), tableName); - if (id != null) { - return 1; - } -// logger.info("插入前的数据：context:{}",JSONObject.toJSONString(context)); - int count = getLocalElogAopDaoMapper().insertElogContext(context, cusColumns, cusValus, tableName); - if (context.getDetailContexts() != null) { - String detailTableName = context.getModuleName() + "_" + context.getFunctionName() + "logs_detail"; - insertBatchDetailPrepared(detailTableName, context); - - } - return count; - } - - /** - * 预编译 - * - * @param detailTableName - * @param context - */ - private void insertBatchDetailPrepared(String detailTableName, LoggerContext context) { - // 用mapper - //分两种 有无自定义字段 - List detailContexts = context.getDetailContexts(); - Boolean hasCustonInfo = false; - String cusColumns = ""; - if (Objects.nonNull(detailContexts.get(0).getCustomDetailInfo())) { - hasCustonInfo = true; - //有自定义明细字段 - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContexts.get(0).getCustomDetailInfo())); - for (String key : (Set) custom.keySet()) { - cusColumns = cusColumns + ", " + key; - } - - } - for (LoggerDetailContext detailContext : detailContexts) { - if (StringUtils.isNotEmpty(detailContext.getNewValue())) { - String str = detailContext.getNewValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); - detailContext.setNewValue(str); - } - if (StringUtils.isNotEmpty(detailContext.getOldValue())) { - String str = detailContext.getOldValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); - detailContext.setOldValue(str); - } - if (StringUtils.isNotEmpty(detailContext.getNewRealValue())) { - String str = detailContext.getNewRealValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); - detailContext.setNewRealValue(str); - } - if (StringUtils.isNotEmpty(detailContext.getOldRealValue())) { - String str = detailContext.getOldRealValue().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); - detailContext.setOldRealValue(str); - } - - - detailContext.setTenant_key(context.getTenant_key()); - detailContext.setCreate_time(new Date()); - detailContext.setUpdate_time(new Date()); - detailContext.setCreator(context.getLogOperator()); - detailContext.setId(IdGenerator.generate()); - if (hasCustonInfo) { - String cusValus = ""; - //如果有明细 - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContext.getCustomDetailInfo())); - for (String key : (Set) custom.keySet()) { - String keystr = custom.getString(key); - //如果keystr包含单引号，将单引号去掉 - if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { - keystr = keystr.replace("'", "''"); - } - cusValus = cusValus + ",'" + keystr + "'"; - } - detailContext.setCusValus(cusValus); - } - } - - - if (hasCustonInfo) { - getLocalElogAopDaoMapper().insertElogDetailPreparedHasCustonInfo(detailTableName, detailContexts, context.getUuid(), cusColumns); - } else { - getLocalElogAopDaoMapper().insertElogDetailPrepared(detailTableName, detailContexts, context.getUuid()); - } - } - - - private void normalizationContext(LoggerContext context) { - String params = ""; - if (StringUtils.isNotEmpty(context.getParamsStr())) { - params = context.getParamsStr(); - } else if (context.getParams() != null) { - params = ElogUtils.compress(JSONObject.toJSONString(context.getParams())); - } - - context.setParamsStr(params); - if (StringUtils.isBlank(context.getCancelContextStr())) { - context.setCancelContextStr(context.getCancelContext() == null ? "" : JSONObject.toJSONString(context.getCancelContext())); - } - if (StringUtils.isBlank(context.getRedoContextStr())) { - context.setRedoContextStr(context.getRedoContext() == null ? "" : JSONObject.toJSONString(context.getRedoContext())); - } - - if (StringUtils.isEmpty(context.getOperatedesc())) { - context.setOperatedesc(""); - } else { - //todo 兼容emojo特殊字符 没有时间 先暴力替换 - String str = context.getOperatedesc().replaceAll("[\\x{1F600}-\\x{1F64F}\\x{1F300}-\\x{1F5FF}]", ""); - context.setOperatedesc(str); - } - - if (Objects.isNull(context.getDate())) { - context.setDate(new Date()); - } - - if (StringUtils.isEmpty(context.getOperator())) { - context.setLogOperator(-1l); - } else { - context.setLogOperator(Long.parseLong(context.getOperator())); - } - if (StringUtils.isEmpty(context.getTargetId())) { - context.setLogTargetid(-1l); - } else { - context.setLogTargetid(Long.parseLong(context.getTargetId())); - } - if (StringUtils.isEmpty(context.getClientIp())) { - context.setClientIp("127.0.0.1"); - } - if (Objects.isNull(context.getCreate_time())) { - context.setCreate_time(new Date()); - } - if (Objects.isNull(context.getUpdate_time())) { - context.setUpdate_time(new Date()); - } - if (Objects.isNull(context.getDelete_type())) { - context.setDelete_type(0); - } - } - - private void insertBatchDetailSql(String detailTableName, LoggerContext context) { - String standardField = "id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, oldRealValue,tableNameDesc, tableNameLabelId,fieldNameLabelId, create_time, update_time"; - - Boolean hasCustonInfo = false; - StringBuilder sb = new StringBuilder(); - sb.append("INSERT INTO ").append(detailTableName).append("(").append(standardField); - //List collect = detailContexts.stream().filter(s -> Objects.nonNull(s.getCustomDetailInfo())).collect(Collectors.toList()); - List detailContexts = context.getDetailContexts(); - if (Objects.nonNull(detailContexts.get(0).getCustomDetailInfo())) { - hasCustonInfo = true; - //有自定义明细字段 - String cusColumns = ""; - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContexts.get(0).getCustomDetailInfo())); - for (String key : (Set) custom.keySet()) { - cusColumns = cusColumns + ", " + key; - } - sb.append(cusColumns); - } - sb.append(")"); - if ("oracle".equalsIgnoreCase(databaseId)) { - sb.append(" ").append(String.join(" UNION ALL ", getBatchInsertValue(context, hasCustonInfo, true))); - } else { - sb.append(" VALUES ").append(String.join(",", getBatchInsertValue(context, hasCustonInfo, false))); - } - - try { - getLocalElogAopDaoMapper().batchInsertDetail(sb.toString()); - } catch (Exception e) { - logger.error("明细批量添加sql是:{},批量插入明细失败，{}", sb.toString(), e.getMessage(), e); - } - - - } - - - private List getBatchInsertValue(LoggerContext context, boolean hasCustomInfo, boolean isOracle) { - - LocalDateTime localDateTime = LocalDateTime.now(); - String nowDate = localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - - List detailContexts = context.getDetailContexts(); - List batchValue = new ArrayList<>(); - for (LoggerDetailContext detailContext : detailContexts) { - detailContext.setTenant_key(context.getTenant_key()); - detailContext.setCreator(context.getLogOperator()); - detailContext.setId(IdGenerator.generate()); - - StringBuilder sb = new StringBuilder(); - sb.append(isOracle ? " SELECT " : " ( "); - sb.append(detailContext.getId()) - .append(",'").append(context.getUuid()).append("'") - .append(",'").append(detailContext.getUuid()).append("'") - .append(",'").append(detailContext.getTableName()).append("'") - .append(",'").append(detailContext.getFieldName()).append("'") - .append(",'").append(transferString(detailContext.getNewValue())).append("'") - .append(",'").append(transferString(detailContext.getOldValue())).append("'") - .append(",'").append(detailContext.getFieldDesc()).append("'") - .append(",'").append(detailContext.getShoworder()).append("'") - .append(",'").append(detailContext.getDataid()).append("'") - .append(",'").append(detailContext.getBelongDataid()).append("'") - .append(",'").append(detailContext.getIsDetail()).append("'") - .append(",'").append(detailContext.getTenant_key()).append("'") - .append(",'").append(detailContext.getCreator()).append("'") - .append(",'").append(transferString(detailContext.getNewRealValue())).append("'") - .append(",'").append(transferString(detailContext.getOldRealValue())).append("'") - .append(",'").append(detailContext.getTableNameDesc()).append("'") - .append(",'").append(detailContext.getTableNameLabelId()).append("'") - .append(",'").append(detailContext.getFieldNameLabelId()).append("'") - .append(",").append(handleValue(nowDate, databaseId)) - .append(",").append(handleValue(nowDate, databaseId)); - - if (hasCustomInfo) { - String cusValus = ""; - //如果有明细 - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(detailContext.getCustomDetailInfo())); - for (String key : (Set) custom.keySet()) { - String keystr = custom.getString(key); - //如果keystr包含单引号，将单引号去掉 - if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { - keystr = keystr.replace("'", "''"); - } - cusValus = cusValus + ",'" + keystr + "'"; - } - sb.append(cusValus); - } - String sql = isOracle ? sb.append(" from dual ").toString() : sb.append(")").toString(); - - batchValue.add(sql); - } - - return batchValue; - } - - private String transferString(String str) { - if (StringUtils.isNotEmpty(str)) { - str = str.replaceAll("#\\{", "\\\\\\\\#{"); - if (str.contains("'")) { - str = str.replace("'", "''"); - } - } - return str; - } - - - private String handleValue(String nowDate, String databaseId) { - switch (databaseId) { - case "mysql": - return "'" + nowDate + "'"; - case "oracle": - return "TO_DATE('" + nowDate + "','YYYY-MM-DD HH24:MI:SS')"; - case "sqlserver": - return "'" + nowDate + "'"; - case "postgresql": - return "'" + nowDate + "'"; - - } - return nowDate; - } - -// private void insertESElogCenter(LoggerContext context, String customInfo, String tableName) { -// //将数据转换为ES的数据格式 -// LogESDoc logESDoc = LogESDoc.context2Doc(context, customInfo, tableName); -// String json = JSON.toJSONString(logESDoc); -// String elogESTableName = ElogEsUtils.getElogESTableName(true, ElogEsUtils.getDateStr(context.getDate())); -// IndexRequest indexRequest = new IndexRequest(elogESTableName).id(logESDoc.getId().toString()); -// indexRequest.source(json, XContentType.JSON); -// -// try { -// client.index(indexRequest, RequestOptions.DEFAULT); -// } catch (IOException e) { -//// logger.info("主表数据添加失败:{}",e.getMessage()); -// } -// } - - - @Override - public int insertElogDetail(LoggerDetailContext loggerDetailContext, String mainId, String detailTableName) { - String cusColumns = ""; - String cusValus = ""; - if (loggerDetailContext.getCustomDetailInfo() != null) { - JSONObject custom = JSONObject.parseObject(JSON.toJSONString(loggerDetailContext.getCustomDetailInfo())); - - for (String key : (Set) custom.keySet()) { - cusColumns = cusColumns + ", " + key; - String keystr = custom.getString(key); - //如果keystr包含单引号，将单引号去掉 - if (StringUtils.isNotEmpty(keystr) && keystr.contains("'")) { - keystr = keystr.replace("'", "''"); - } - cusValus = cusValus + ",'" + keystr + "'"; - } - } - loggerDetailContext.setId(IdGenerator.generate()); - return getLocalElogAopDaoMapper().insertElogDetail(loggerDetailContext, mainId, cusColumns, cusValus, detailTableName); - - } - -// @Override -// public void rollBackElog(LoggerContext context) { -// //根据ID 判断数据是否存在 -// -// String tableName = getElogTableName(context.getModuleName(), context.getFunctionName()); -// Integer id = getLocalElogAopDaoMapper().queryElogContextById(context.getId(), tableName); -// //没查到就直接返回 -// if (id == null) { -// lazyRollBack.delayedRollBack(context); -// return; -// } -// getLocalElogAopDaoMapper().rollBackElogById(context.getId(), tableName); -// -//// if (context.getDetailContexts() != null) { -// String detailTableName = context.getModuleName() + "_" + context.getFunctionName() + "logs_detail"; -// //根据uuid回滚 -// getLocalElogAopDaoMapper().rollBackDetailElogByUUID(context.getUuid(), detailTableName); -//// } -// -// -// } - - /** - * 判断字符串是否为日期格式 - */ - public static Boolean checkStrIsDate(String str) { - if (StringUtils.isBlank(str)) { - return false; - } else { - try { - LocalDateTime.parse(str, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - return true; - } catch (Exception e) { - return false; - } - } - } - - private String getElogTableName(String moduleName, String functionName) { - -// List list = Arrays.asList("meetingTopic", "meetingService", "meetingDecision", "meetingSign", "meetingSignSet", "meetingMember", "meetingShare"); - -// if (list.contains(moduleName)) { -// return "meeting"+ "_" + functionName + "logs"; -// } - - return moduleName + "_" + functionName + "logs"; - - } - -} diff --git a/src/com/engine/salary/elog/service/impl/LoggerTableService.java b/src/com/engine/salary/elog/service/impl/LoggerTableService.java deleted file mode 100644 index a40f63488..000000000 --- a/src/com/engine/salary/elog/service/impl/LoggerTableService.java +++ /dev/null @@ -1,1454 +0,0 @@ -package com.engine.salary.elog.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.cloudstore.eccom.pc.table.WeaTable; -import com.cloudstore.eccom.pc.table.WeaTableColumn; -import com.engine.core.impl.Service; -import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.elog.annotation.OperateType; -import com.engine.salary.elog.entity.dto.ElogBean; -import com.engine.salary.elog.entity.dto.FilterConditionDto; -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.entity.dto.ShowColumsDto; -import com.engine.salary.elog.entity.param.ELogGetLogParam; -import com.engine.salary.elog.entity.param.GetDetailChangesParam; -import com.engine.salary.elog.enums.ElogConsts; -import com.engine.salary.elog.service.ILoggerTableService; -import com.engine.salary.elog.util.ElogServiceUtils; -import com.engine.salary.elog.util.ElogSeviceSwitchUtils; -import com.engine.salary.elog.util.ElogSeviceUtils; -import com.engine.salary.elog.util.FieldNameMap; -import com.engine.salary.mapper.elog.LocalElogDaoMapper; -import com.engine.salary.util.SalaryI18nUtil; -import com.engine.salary.util.db.MapperProxyFactory; -import com.engine.salary.util.page.Column; -import com.engine.salary.util.page.PageInfo; -import com.engine.salary.util.page.SalaryPageUtil; -import com.github.pagehelper.Page; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import weaver.conn.RecordSet; -import weaver.general.Util; - -import javax.servlet.http.HttpServletRequest; -import java.util.*; -import java.util.stream.Collectors; - -public class LoggerTableService extends Service implements ILoggerTableService { - - private static final Logger logger = LoggerFactory.getLogger(LoggerTableService.class); - - private LocalElogDaoMapper getLocalElogDaoMapper() { - return MapperProxyFactory.getProxy(LocalElogDaoMapper.class); - } - - // -// private ComInfoCache comInfoCache; -// -// -// private HrmCommonUtil hrmCommonUtil; -// -// -// private QueryCommonTabeMapper queryCommonTabeMapper; -// -// -// private RestHighLevelClient restHighLevelClient; -// -// @Resource -// private BatchExportSender batchExportSender; -// -// -// @Resource -// private DateRangeTransformer dateRangeTransformer; -// -// -// private HrmCommonEmployeeService hrmCommonEmployeeService; -// -// - private final String databaseId = new RecordSet().getDBType(); - - @Override - public PageInfo queryLogs(String data) { - //解析数据 - ElogBean elogBean = ElogServiceUtils.getElogBean(data); - // columIndex统一转为小写 - Optional.ofNullable(elogBean.getShowColumns()) - .ifPresent(list -> { - list.forEach(x -> { - if (StringUtils.isNotBlank(x.getColumIndex())) { - x.setColumIndex(x.getColumIndex().toLowerCase()); - } - }); - }); - - List showColums = elogBean.getShowColumns(); - String module = elogBean.getModule(); - String function = elogBean.getFunction(); - String searchMap = elogBean.getSearchMap(); - String pageSize = elogBean.getPageSize(); - String pageNum = elogBean.getCurrent(); - String downloadSize = elogBean.getDownloadSize(); - List filterConditionDtos = elogBean.getFilterConditionDtos(); - String transMethod = elogBean.getTransMethod(); - Map authParamsJson = elogBean.getAuthParamsJson(); - - //获取 context 数据 - LoggerContext context = new LoggerContext(); - context.setModuleName(module); - context.setFunctionName(function); - context.setTenant_key(getTenantKey()); -// context.setOperator(getEmployeeId()); - //获取主表 - String tableName = ElogSeviceUtils.getTableName(module, function); - //获取weaTable - List columns = getWeaColumns(data, showColums, module, function); - //获取条件sql - String searchMapsql = getSearchMapSql(searchMap, module, function, elogBean.getShowColumns()); - String sb = getQueryCondition(filterConditionDtos); - sb = searchMapsql.concat(sb); - String customSql = getCustomSql(transMethod, sb, "before"); - - // 分页 - Page page = null; - if (StringUtils.isEmpty(downloadSize)) { - page = new Page(ElogSeviceUtils.getIntValue(pageNum, 1), ElogSeviceUtils.getIntValue(pageSize, 10)); - } else { - int pagesize = ElogSeviceUtils.getIntValue(downloadSize, 5000); - page = new Page(1, pagesize); - } - - List list = getLocalElogDaoMapper().queryElogList(page, context, null, tableName, customSql, "*"); - Map countMap = getLocalElogDaoMapper().elogCount(context, tableName, customSql); - - if ("st".equals(databaseId)) { - //st数据库 date类型特殊处理 - list.forEach(map -> { - map.forEach((k, v) -> { - if (v instanceof Date) { - map.put(k, DateUtil.format((Date) v, "yyyy-MM-dd HH:mm:ss")); - } - }); - }); - - } - //处理转换其他数据库类型值 - list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); - //处理用户信息Data - - // 大小写转换 - ElogSeviceSwitchUtils.changKey2Lower(list); - - // 存放结果集 - PageInfo pageInfo = SalaryPageUtil.buildPage(page.getPageNum(), page.getPageSize(), switchString(list)); - pageInfo.setTotal(ElogSeviceUtils.getLongValue(countMap.get("counts") + "", 0)); - pageInfo.setColumns(columns); - return pageInfo; - } - - @Override - public WeaTable queryLogsPapi(String data, HttpServletRequest request) { - return null; - } - - @Override - public List getDetailChangesPapi(String module, String function, String mainid, String transMethod, HttpServletRequest request) { - return null; - } - - - private String getshowColumsStr(List showColums) { - StringBuffer sb = new StringBuffer(); - sb.append("id,uuid,targetid,params,operatetype,link_id,link_type,"); - for (ShowColumsDto showColum : showColums) { - String columIndex = showColum.getColumIndex(); - if ("date".equalsIgnoreCase(columIndex) || "createdate".equalsIgnoreCase(columIndex)) { - columIndex = "log_date"; - } else if ("operator".equalsIgnoreCase(columIndex)) { - columIndex = "log_operator"; - } else if ("modulenamespan".equalsIgnoreCase(columIndex)) { - columIndex = "modulename"; - } else if ("functionnameespan".equalsIgnoreCase(columIndex)) { - columIndex = "functionname"; - } else if ("avatar".equals(columIndex)) { - continue; - } - sb.append(columIndex).append(","); - } - String substring = sb.toString().substring(0, sb.toString().length() - 1); - return substring; - } - -// private PermissionParams getPermissionParams(Map hashMap) { -// PermissionParams permissionParams = new PermissionParams(); -// String permissionId = getPermissionStr(hashMap, "permissionId"); -// String permissionType = getPermissionStr(hashMap, "permissionType"); -// String mainDataTableAlias = getPermissionStr(hashMap, "mainDataTableAlias"); -// String mainDataTable = getPermissionStr(hashMap, "mainDataTable"); -// String primaryKey = getPermissionStr(hashMap, "primaryKey"); -// String permissionTargetId = getPermissionStr(hashMap, "permissionTargetId"); -// String permissionConfigSourceId = getPermissionStr(hashMap, "permissionConfigSourceId"); -// -// permissionParams.setPermissionId(permissionId); -// permissionParams.setPermissionType(permissionType); -// permissionParams.setMainDataTableAlias(mainDataTableAlias); -// permissionParams.setMainDataTable(mainDataTable); -// permissionParams.setPrimaryKey(primaryKey); -// permissionParams.setPermissionTargetId(permissionTargetId); -// permissionParams.setPermissionConfigSourceId(permissionConfigSourceId); -// -// return permissionParams; -// -// } - - private List getWeaColumns(String data, List showColums, String module, String function) { - List columns = new ArrayList<>(); - if (showColums != null && showColums.size() > 0) { - for (ShowColumsDto showColum : showColums) { - if (StringUtils.isNotBlank(showColum.getAliasColumName())) { - columns.add(new Column(showColum.getAliasColumName(), showColum.getColumIndex(), showColum.getColumIndex())); - } else if (StringUtils.isNotBlank(showColum.getColumName())) { - columns.add(new Column(FieldNameMap.getMainFieldNameMap(data, function, showColum.getColumName()), showColum.getColumIndex(), showColum.getColumIndex())); - } - } - } else { - columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "moduleName"), "modulenamespan", "modulenamespan")); - columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "functionName"), "functionnamespan", "functionnamespan")); - columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "clientIp"), "clientip", "clientip")); - columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "operateTypeName"), "operatetypename", "operatetypename")); - columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "targetName"), "targetname", "targetname")); - columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "date"), "createdate", "createdate")); - columns.add(new Column(FieldNameMap.getMainFieldNameMap(module, function, "operatorName"), "operatorname", "operatorname")); - } - return columns; - } - - private String getTargetid(List filterConditionDtos) { - if (!filterConditionDtos.isEmpty()) { - for (FilterConditionDto filterConditionDto : filterConditionDtos) { - if ("targetid".equalsIgnoreCase(filterConditionDto.getColumIndex())) { - return filterConditionDto.getValue(); - } - } - } - return ""; - } - - private String getPermissionStr(Map hashMap, String str) { - if (hashMap != null && hashMap.size() > 0) { - Object obj = hashMap.get(str); - if (obj != null) { - return obj.toString(); - } - } - return ""; - } - -// private Map getCustomAuthSql(String transMethod, Map params, String prefix) { -// MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); -// Map hashMap = new HashMap<>(); -// if (beforeMethodHandler != null) { -// try { -// hashMap.put("flag", true); -// hashMap.put("msg", ""); -// hashMap.putAll(params); -// Object execute = beforeMethodHandler.execute(hashMap); -// if (execute != null && execute instanceof Map) { -// Map map = (Map) execute; -// return map; -// } -// } catch (Exception e) { -// logger.error("转换出错：" + e); -// throw new RuntimeException(e.getMessage()); -// } -// } -// return hashMap; -// } - - - private String getCustomSql(String transMethod, String sql, String prefix) { -// MethodHandler beforeMethodHandler = ElogMethodHandler.loadMethodHandler(prefix + transMethod); -// boolean flag = false; -// if (beforeMethodHandler != null) { -// try { -// String subSql = ""; -// if (sql.length() > 5) { -// flag = true; -// subSql = sql.substring(5, sql.length()); -// } -// Object execute = beforeMethodHandler.execute(subSql); -// if (execute != null) { -// if (execute instanceof String) { -// StringBuffer sb = null; -// if(execute.toString().length()==0){ -// sb = new StringBuffer(); -// } else if (flag || execute.toString().length() > 0) { -// sb = new StringBuffer(" and "); -// } else { -// sb = new StringBuffer(); -// } -// -// sb.append(execute.toString()); -// return sb.toString(); -// } -// } -// } catch (Exception e) { -// logger.error("转换出错：" + e); -// throw new RuntimeException(e.getMessage()); -// } -// } - return sql; - } - - private void transUserInfo(List list) { -// List operators = new ArrayList<>(); -// if (list != null && list.size() > 0) { -// for (Map map : list) { -// //避免暴露内网地址 -// map.remove("requesturl"); -// -// Object operator = map.get("operator"); -// if (operator != null && StringUtils.isNotBlank(operator.toString())) { -// operators.add(ElogSeviceUtils.getLongValue(operator.toString())); -// } -// } -// } -// List cacheList = comInfoCache.getCacheList(HrmEmployeeComInfo.class, operators); -// Map infoHashMap = new HashMap<>(); -// if (cacheList != null && cacheList.size() > 0) { -// for (HrmEmployeeComInfo hrmEmployeeComInfo : cacheList) { -// HrmAvatarComInfo hrmAvatarComInfo = (HrmAvatarComInfo) comInfoCache.getCacheById(HrmAvatarComInfo.class, hrmEmployeeComInfo.getAvatar()); -// ElogHrmSimpleEmployeeInfo info = new ElogHrmSimpleEmployeeInfo(); -// if (hrmAvatarComInfo != null) { -// info.setAvatarP3Id(hrmAvatarComInfo.getP3()); -// } -// info.setId(hrmEmployeeComInfo.getId()); -// info.setUserName(hrmEmployeeComInfo.getUsername()); -// infoHashMap.put(hrmEmployeeComInfo.getId(), info); -// } -// } -// if (list != null && list.size() > 0) { -// for (Map map : list) { -// Object operator = map.get("operator"); -// if (map.get("params") != null && map.get("params").toString().startsWith("H4s")) { -// map.put("params", ElogSeviceUtils.uncompress(map.get("params").toString())); -// } -// map.put("dboperatorname", Util.null2String(map.get("operatorname"))); -// if (operator != null && StringUtils.isNotBlank(operator.toString())) { -// Map i18nOperatorMap = new HashMap<>(); -// ElogHrmSimpleEmployeeInfo hrmEmployeeComInfo = infoHashMap.get(Long.parseLong(operator.toString())); -// if (hrmEmployeeComInfo != null) { -// //获取最新的人员名称并进行多语言转换 -// i18nOperatorMap.put(Long.parseLong(operator.toString()), hrmEmployeeComInfo.getUserName()); -// Map parseI18nOperator = HrmI18nUtil.batchCovertEmployee(i18nOperatorMap, map.get("tenant_key").toString()); -// map.put("operatorname", parseI18nOperator.get(Long.parseLong(operator.toString()))); -// -//// if (StringUtils.isNotEmpty(hrmEmployeeComInfo.getUserName())) { -//// map.put("operatorname", hrmEmployeeComInfo.getUserName()); -//// } -// if (hrmEmployeeComInfo.getAvatarP3Id() != null) { -// map.put("avatar", hrmEmployeeComInfo.getAvatarP3Id()); -// } -// } -// } -// } -// } - } - - /** - * 获取宽度 - * - * @param showColum - * @return - */ - private String getColumnsWidth(ShowColumsDto showColum) { - if (StringUtils.isBlank(showColum.getWidth())) { - return "5%"; - } else { - return showColum.getWidth(); - } - } - - private String getTenantKey() { -// User currentUser = UserContext.getCurrentUser(); -// if (currentUser != null) { -// return currentUser.getTenantKey(); -// } else { -// String tenantKey = TenantRpcContext.getTenantKey(); -// if (StringUtils.isNotBlank(tenantKey)) { -// return tenantKey; -// } -// } - return SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; - } - -// private String getEmployeeId() { -// -// User currentUser = UserContext.getCurrentUser(); -// if (currentUser != null && !currentUser.isAdmin()) { -// String employeeId = TenantRpcContext.getEmployeeId(); -// return StringUtils.isNotBlank(employeeId) ? employeeId : ""; -// } -// return ""; -// } -// -// private String getUserId() { -// User currentUser = UserContext.getCurrentUser(); -// if (currentUser != null) { -// return currentUser.getEmployeeId().toString(); -// } -// String employeeId = TenantRpcContext.getEmployeeId(); -// return StringUtils.isNotBlank(employeeId) ? employeeId : ""; -// } - - /** - * 拼接搜索条件 - * - * @param searchMap - * @param module - * @param function - * @return - */ - private String getSearchMapSql(String searchMap, String module, String function, List showColumns) { - StringBuffer sb = new StringBuffer(); - Map map = JSON.parseObject(searchMap); - if (map == null) return sb.toString(); - Iterator> iterators = map.entrySet().iterator(); - while (iterators.hasNext()) { - Map.Entry next = iterators.next(); - String key = next.getKey(); -// SecurityUtil.sqlCheck(key); - if ("date".equals(key) || "createdate".equals(key)) { - Object date = next.getValue(); - if (date != null) { - if (StringUtils.isNotBlank(date.toString())) { - List dates = (List) date; -// if (dates != null && dates.size() == 2) { -// Object startDate = dates.get(0); -// Object endDate = dates.get(1); -// startDate = ElogSeviceUtils.checkValSql(startDate.toString()); -// endDate = ElogSeviceUtils.checkValSql(endDate.toString()); -// if (StringUtils.isNotBlank(startDate.toString()) && StringUtils.isNotBlank(endDate.toString())) { -// startDate = startDate.toString().replaceAll("'", "''"); -// endDate = endDate.toString().replaceAll("'", "''"); -// String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); -// String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); -// sb.append(" and log_date ").append(" between ").append(getSwithDatabaseDate(dateRangeAfter)).append(" and ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); -// } else if (StringUtils.isNotBlank(startDate.toString())) { -// String dateRangeAfter = dateRangeTransformer.getDateRangeAfter(startDate.toString()); -// sb.append(" and log_date ").append(" >= ").append(getSwithDatabaseDate(dateRangeAfter)).append(" "); -// } else if (StringUtils.isNotBlank(endDate.toString())) { -// String dateRangeBefore = dateRangeTransformer.getDateRangeBefore(endDate.toString()); -// sb.append(" and log_date ").append(" <= ").append(getSwithDatabaseDate(dateRangeBefore)).append(" "); -// } -// } - } - } - } else if ("operator".equals(next.getKey())) { - Object operator = next.getValue(); - if (operator != null) { - if (StringUtils.isNotBlank(operator.toString())) { - operator = ElogSeviceUtils.checkValSql(operator.toString()); - operator = operator.toString().replaceAll("'", "''"); - if (StringUtils.isNumeric(operator.toString()) && operator.toString().length() > 15) { - sb.append(" and log_operator = ").append(operator.toString()).append(" "); - } - -// else { -// List likeNameHrmEmployeeList = hrmCommonEmployeeService.queryEmpsByCondidtion( -// new HrmOrgEmpCondition().setNameLikeList(Arrays.asList(operator.toString())).setTenantKey(getTenantKey()), -// HrmConditionResultType.BEAN.name()); -// if (likeNameHrmEmployeeList != null && likeNameHrmEmployeeList.size() > 0) { -// List ids = likeNameHrmEmployeeList.stream().map(HrmEmployee::getId).collect(Collectors.toList()); -// if (ids != null && ids.size() > 0) { -// sb.append(" and ( operatorname like '%").append(operator.toString()).append("%' ") -// .append(" or log_operator in (").append(StringUtils.join(ids, ",")).append(")) "); -// } -// } else { -// sb.append(" and operatorname like '%").append(operator.toString()).append("%' "); -// } -// } - } - } - } else if ("modulename".equals(next.getKey())) { - Object moduleName = next.getValue(); - if (moduleName != null) { - moduleName = moduleName.toString().replaceAll("'", "''"); - if (StringUtils.isNotBlank(moduleName.toString())) { - moduleName = ElogSeviceUtils.checkValSql(moduleName.toString()); - //sb.append(" and modulename = '").append(moduleName.toString()).append("' "); - StringBuffer stringBuffer = new StringBuffer(); - if (isEnglish(moduleName.toString())) { - Map moduleMap = ElogSeviceSwitchUtils.moduleMap; - Iterator> iterator = moduleMap.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry nextObj = iterator.next(); - if (nextObj.getKey().contains(moduleName.toString())) { - stringBuffer.append("'").append(nextObj.getKey()).append("',"); - } - } - - } else { - Map moduleMap = ElogSeviceSwitchUtils.moduleMap; - Iterator> iterator = moduleMap.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry nextObj = iterator.next(); - String val = ElogSeviceSwitchUtils.getModuleName(nextObj.getValue() + ""); - if (val.contains(moduleName.toString())) { - stringBuffer.append("'").append(nextObj.getKey()).append("',"); - } - } - } - String str = ""; - if (stringBuffer.toString().length() > 0) { - str = stringBuffer.substring(0, stringBuffer.length() - 1); - String inVals = str.toString().replaceAll("''", "'"); - sb.append(" and modulename in (").append(inVals).append(") "); - } else { - sb.append(" and modulename = '").append(moduleName.toString()).append("' "); - } - } - } - } else if (databaseId.equalsIgnoreCase(ElogConsts.POSTGRESQL) && "targetid".equalsIgnoreCase(next.getKey())) { - //兼容PG环境int类型不支持模糊搜索的问题 - String value = next.getValue().toString().replaceAll("'", "''"); - value = ElogSeviceUtils.checkValSql(value.toString()); - if (value.startsWith("_")) { - value = value.replace("_", "\\_"); - } - //将类型转为varchar再进行查询 - sb.append(" and ").append("cast(").append(key).append(" as VARCHAR(255) )").append(" like '%").append(value).append("%' "); - } else { - - if (next.getValue() != null && StringUtils.isNotBlank(key) && StringUtils.isNotBlank(next.getValue().toString())) { - String value = next.getValue().toString().replaceAll("'", "''"); - value = ElogSeviceUtils.checkValSql(value.toString()); - StringBuilder stringBuffer = new StringBuilder(); -// if (isLikeSearch(showColumns, key)) { -// String logSearchSql = I18nUtil.getLogSearchSql(ElogSeviceUtils.getTableName(module, function), key, value); -// String sql = logSearchSql.replaceAll("%_", "%\\\\_"); -// try { -// List maps = queryCommonTabeMapper.queryLabelIds(sql); -// if (maps != null && maps.size() > 0) { -// for (Map map1 : maps) { -// Object indexid = map1.get(key); -// if (indexid == null || StringUtils.isEmpty(indexid.toString())) { -// indexid = map1.get(key.toLowerCase()); -// } -// if (indexid != null && StringUtils.isNotEmpty(indexid.toString())) { -// String val = indexid.toString().replace("'", "''"); -// if (ElogSeviceUtils.checkIsNumber(map.get(key))) { -// val = "-" + val; -// value = "-" + value; -// } -// stringBuffer.append("'").append(val).append("',"); -// } -// } -// } -// } catch (Exception e) { -// logger.error("i18查询sql报错：{}", e.getMessage(), e); -// } -// -// } - String str = ""; - if (stringBuffer.toString().length() > 0) { - str = stringBuffer.substring(0, stringBuffer.length() - 1); - if (value.startsWith("_")) { - value = value.replace("_", "\\_"); - } - sb.append(" and (").append(key).append(" like '%").append(value).append("%' "); - //String inVals = str.toString().replaceAll("''", "'"); - if (str.startsWith("_")) { - str = str.replace("_", "\\_"); - } - if ("operatetypename".equals(key)) { - String s = ElogSeviceUtils.checkValSql(next.getValue().toString()); - sb.append(matchOperatetype(s)); - } - sb.append(" or ").append(key).append(" in (").append(str).append(")) "); - } else { - if ("operatetypename".equals(key)) { - sb.append(" and (").append(key).append(" like '%").append(value).append("%' "); - String s = ElogSeviceUtils.checkValSql(next.getValue().toString()); - sb.append(matchOperatetype(s)).append(")"); - } else { - if (value.startsWith("_")) { - value = value.replace("_", "\\_"); - } - sb.append(" and ").append(key).append(" like '%").append(value).append("%' "); - } - } - - } - } - } - return sb.toString(); - } - -// /** -// * 是否模糊搜索 -// * -// * @param showColumns -// * @param key -// * @return -// */ -// private boolean isLikeSearch(List showColumns, String key) { -// for (ShowColumsDto showColumn : showColumns) { -// if (key.equalsIgnoreCase(showColumn.getColumIndex()) && showColumn.isTransfLanguage()) { -// return true; -// } -// } -// return false; -// } - -// private String getSwithDatabaseDate(String date) { -// if (ElogConsts.ORACLE.equals(DatabaseUtil.getDatabaseId())) { -// return " to_date('" + date + "','yyyy-mm-dd hh24:mi:ss') "; -// } else if (ElogConsts.POSTGRESQL.equals(DatabaseUtil.getDatabaseId())) { -// return " to_timestamp('" + date + "', 'YYYY-MM-DD HH24:MI:SS') "; -// } else if (ElogConsts.SQLSERVER.equals(DatabaseUtil.getDatabaseId())) { -// return " convert(nvarchar(19),'" + date + "',120) "; -// } else { -// return " DATE_FORMAT('" + date + "','%Y-%m-%d %H:%i:%s') "; -// } -// } - - public String matchOperatetype(String str) { -// if (ElogSeviceUtils.currentLanguage() != 8) { -// return ""; -// } - List list = new ArrayList(); - list.add(OperateType.add); - list.add(OperateType.update); - list.add(OperateType.view); - list.add(OperateType.delete); - - StringBuffer sb = new StringBuffer(); - for (String o : list) { - if (o.toLowerCase().contains(str.toLowerCase())) { - sb.append("'").append(o).append("',"); - } - } - if ("new".toLowerCase().contains(str.toLowerCase())) { - sb.append("'add',"); - } - String sql = ""; - if (sb.length() > 0) { - sql = sb.toString().substring(0, sb.length() - 1); - sql = "or operatetype in (" + sql + ")"; - } - - return sql; - - } - - - public static boolean isEnglish(String charaString) { - return charaString.matches("^[a-zA-Z]*"); - - } - - /** - * 获取搜索条件 - * - * @param filterConditionDtos - * @return - */ - private String getQueryCondition(List filterConditionDtos) { - StringBuffer sb = new StringBuffer(); - if (filterConditionDtos != null && filterConditionDtos.size() > 0) { - for (FilterConditionDto filterConditionDto : filterConditionDtos) { - if (StringUtils.isNotBlank(filterConditionDto.getColumIndex())) { - sb.append(getsql(filterConditionDto)); - } - } - } - return sb.toString(); - } - - /** - * 拼接sql - * - * @param filterConditionDto - * @return - */ - private String getsql(FilterConditionDto filterConditionDto) { - StringBuffer sb = new StringBuffer(); - filterConditionDto.setConnectCondition(ElogSeviceUtils.checkConditionSql(filterConditionDto.getConnectCondition())); - filterConditionDto.setType(ElogSeviceUtils.checkTypeSql(filterConditionDto.getType())); - filterConditionDto.setValue(ElogSeviceUtils.checkValSql(filterConditionDto.getValue())); - switchDatabaseFieldIndex(filterConditionDto); - if ("LIKE".equalsIgnoreCase(filterConditionDto.getType())) { - if (filterConditionDto.getLike() != null) { - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(" '"). - append(filterConditionDto.getLike().getPrefix() != null ? filterConditionDto.getLike().getPrefix() : ""). - append(filterConditionDto.getValue()). - append(filterConditionDto.getLike().getSuffix() != null ? filterConditionDto.getLike().getSuffix() : ""). - append("' "); - } - } else if ("IN".equalsIgnoreCase(filterConditionDto.getType())) { - String[] split = filterConditionDto.getValue().split("\",\""); - if (split.length > 0) { - StringBuffer str = new StringBuffer("("); - String value = ""; - if ("targetid".equals(filterConditionDto.getColumIndex()) || "log_operator".equals(filterConditionDto.getColumIndex())) { - List list = JSONArray.parseArray(filterConditionDto.getValue(), String.class); - for (String s : list) { - str.append(s).append(","); - } - } else { - List list = JSONArray.parseArray(filterConditionDto.getValue(), String.class); - for (String s : list) { - str.append("'").append(s).append("',"); - } - } - - value = str.toString().substring(0, str.length() - 1); - value += ")"; - switchDatabaseFieldIndex(filterConditionDto); - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(value). - append(" "); - - } else if (split.length == 0) { - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(" ('"). - append(filterConditionDto.getValue()). - append("') "); - } - } else if ("IS NULL".equalsIgnoreCase(filterConditionDto.getType()) || "IS NOT NULL".equalsIgnoreCase(filterConditionDto.getType())) { - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(" "); - } else if ("BETWEEN".equalsIgnoreCase(filterConditionDto.getType())) { - String[] split = filterConditionDto.getValue().split("\",\""); - StringBuffer stringBuffer = new StringBuffer(); - if (split.length > 0) { - List list = JSONArray.parseArray(filterConditionDto.getValue(), String.class); - String str = ""; - for (String s : list) { - stringBuffer.append(" '").append(s).append("' AND"); - } - str = stringBuffer.toString().substring(0, stringBuffer.length() - 3); - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(str). - append(" "); - } else if (split.length == 0) { - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(" '"). - append(filterConditionDto.getValue()). - append("' "); - } - } else { - if ("targetid".equals(filterConditionDto.getColumIndex()) || "log_operator".equals(filterConditionDto.getColumIndex())) { - if (StringUtils.isNotBlank(filterConditionDto.getValue())) { - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(" "). - append(filterConditionDto.getValue()). - append(" "); - } else { - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(" "). - append(-1). - append(" "); - } - } else { - sb.append(" "). - append(getConnectCondition(filterConditionDto.getConnectCondition())). - append(" "). - append(filterConditionDto.getColumIndex()). - append(" "). - append(getQueryType(filterConditionDto.getType())). - append(" '"). - append(filterConditionDto.getValue()). - append("' "); - } - - } - return sb.toString(); - } - - private void switchDatabaseFieldIndex(FilterConditionDto filterConditionDto) { - if ("operator".equalsIgnoreCase(filterConditionDto.getColumIndex())) { - filterConditionDto.setColumIndex("log_operator"); - } else if ("date".equalsIgnoreCase(filterConditionDto.getColumIndex())) { - filterConditionDto.setColumIndex("log_date"); - } else if ("result".equalsIgnoreCase(filterConditionDto.getColumIndex())) { - filterConditionDto.setColumIndex("log_result"); - } - } - - - /** - * 获取查询类型 - * - * @param type - * @return - */ - private String getQueryType(String type) { - //如果不填默认是= - if (StringUtils.isBlank(type)) { - return " = "; - } - return type; - } - - /** - * 获取连接条件 - * - * @param connectCondition - * @return - */ - private String getConnectCondition(String connectCondition) { - //如果不填默认是AND - if (StringUtils.isBlank(connectCondition)) { - return " AND "; - } - return connectCondition; - } - - @Override - public List> getDetailChanges(GetDetailChangesParam param) { - return getDetailChangesMethod(param.getModule(), param.getFunction(), param.getMainid(), param.getDetailTransMethod(), null); - } - - /** - * 明细分页查询 - * - * @param module - * @param function - * @param mainid - * @param detailTransMethod - * @param current - * @param pageSize - * @return - */ - @Override - public WeaTable getDetailChangePages(String module, String function, String mainid, String detailTransMethod, String current, String pageSize) { - - Integer pageNum = Util.getIntValue(current, 1); - Integer size = Util.getIntValue(pageSize, 10); - Page page = new Page(pageNum, size); - - List> list = getDetailChangesMethod(module, function, mainid, null, page); - - //查询分页总数 - String tableName = ElogSeviceUtils.getTableName(module, function, true); - Integer total = getLocalElogDaoMapper().queryAllChangesPageCounts(tableName, mainid); - WeaTable weaTable = new WeaTable(); - weaTable.setColumns(getDetailColumns(list)); - - - PageInfo pageInfo = SalaryPageUtil.buildPage(pageNum, size, list); - pageInfo.setTotal(total); - - return weaTable; - } - - private List getDetailColumns(List> list) { - - List columns = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(list)) { - List detailcontexts = (List) list.get(0).get("detailcontexts"); - if (CollectionUtils.isNotEmpty(detailcontexts)) { - for (Map map : detailcontexts) { - WeaTableColumn weaTableColumn = new WeaTableColumn(); - // 列表属性名 - weaTableColumn.setColumn((String) map.get("fieldname")); - //显示名称 多语言转换 fieldnamelabelid - weaTableColumn.setText((String) map.get("fieldname")); - columns.add(weaTableColumn); - } - } - } - return columns; - } - - public List> getDetailChangesMethod(String module, String function, String mainid, String detailTransMethod, Page page) { - - List list = new ArrayList<>(); - String tableName = ElogSeviceUtils.getTableName(module, function, true); - String maintableName = ElogSeviceUtils.getTableName(module, function, false); - List maps = getLocalElogDaoMapper().queryAllMainData(maintableName, mainid); - - maps = ElogSeviceSwitchUtils.getSwitchDatabaseData(maps); - ElogSeviceSwitchUtils.changKey2Lower(maps); - List allChangesData = new ArrayList<>(); - //如果有分页数据则走分页方法 - if (Objects.nonNull(page)) { -// Integer offset = (pageNum - 1) * size; - //分页查询明细数据 - allChangesData = getLocalElogDaoMapper().queryAllChangesDataPages(tableName, mainid, page); - } else { - //没有被则不分页 - allChangesData = getLocalElogDaoMapper().queryAllChangesData(tableName, mainid); - } - ElogSeviceSwitchUtils.changKey2Lower(allChangesData); - allChangesData = ElogSeviceSwitchUtils.getSwitchDatabaseData(allChangesData); - List mainlist = new ArrayList<>(); - List detaillist = new ArrayList<>(); - if (allChangesData != null && allChangesData.size() > 0) { - for (Map allChangesDatum : allChangesData) { - Object o = allChangesDatum.get("isdetail"); - if (o != null) { - if ("0".equals(o.toString())) { - mainlist.add(allChangesDatum); - } else { - detaillist.add(allChangesDatum); - } - } - } - } -// List mainlist = getLocalElogDaoMapper().queryAllMainChanges(tableName, mainid); -// List detaillist = getLocalElogDaoMapper().queryAllDetailChanges(tableName, mainid); - //List moduleInfo = queryCommonTabeMapper.queryModuleNameInfo(module); - List moduleInfo = new ArrayList<>(); - processDetailInfo(mainlist, detaillist, moduleInfo); - Map map = ElogSeviceSwitchUtils.switchChangeValue(mainlist, maps); - Map detailMap = ElogSeviceSwitchUtils.switchDetailChangeValue(detaillist); - map.putAll(detailMap); - if (maps != null && maps.size() > 0) { - Map maininfoMap = maps.get(0); - String operatetypename = (String) maininfoMap.get("operatetypename"); - String targetname = (String) maininfoMap.get("targetname"); - //长度大于1避免部分模块为1，2，3这类的操作类型 - if (StringUtils.isNumeric(operatetypename) && operatetypename.length() > 1 && operatetypename.length() < 10) { - String transfOperatetypename = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(operatetypename), operatetypename); - maininfoMap.put("operatetypename", transfOperatetypename); - } - if (StringUtils.isNumeric(targetname) && targetname.length() > 1 && targetname.length() < 10) { - String transfTargetname = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(targetname), targetname); - maininfoMap.put("targetname", transfTargetname); - } - map.put("maininfo", maininfoMap); - - map.put("detailtitle", ""); - } - - list.add(map); - //List transfLanguageData = ElogSeviceSwitchUtils.transfLanguageData(list); - return list; - - } - - /** - * 处理修改详情转多语言(主表和明细表) - * - * @param mainlist - * @param detaillist - * @param commonTableInfo - * @return - */ - private void processDetailInfo(List mainlist, List detaillist, List commonTableInfo) { - Map tablenameMap = new HashMap<>(); - Map fieldnameMap = new HashMap<>(); - Map valueMap = new HashMap<>(); - - if (commonTableInfo != null && commonTableInfo.size() > 0) { - for (Map commonTableInfoMap : commonTableInfo) { - JSONObject commonTableInfoMapJs = JSONObject.parseObject(JSONObject.toJSONString(commonTableInfoMap)); - String tablename = commonTableInfoMapJs.getString("table_name"); - String tablename_labelid = commonTableInfoMapJs.getString("tablename_labelid"); - String fieldname = commonTableInfoMapJs.getString("field_name"); - String fieldname_labelid = commonTableInfoMapJs.getString("fieldname_labelid"); - String values_kvpairs = commonTableInfoMapJs.getString("values_kvpairs"); - fieldnameMap.put(fieldname, fieldname_labelid); - if (StringUtils.isNotBlank(fieldname) && StringUtils.isNotBlank(values_kvpairs)) { - JSONObject jsonObject = JSONObject.parseObject(values_kvpairs); - valueMap.put(fieldname, jsonObject); - } - Object tablenameObj = tablenameMap.get(tablename); - if (tablenameObj == null) { - tablenameMap.put(tablename, tablename_labelid); - } - } - } - - - if (mainlist != null && mainlist.size() > 0 && fieldnameMap.size() > 0 && valueMap.size() > 0) { - for (Map mainlistMap : mainlist) { - JSONObject mainMapJs = JSONObject.parseObject(JSONObject.toJSONString(mainlistMap)); - String fielddesc = mainMapJs.getString("fielddesc"); - String oldvalue = mainMapJs.getString("oldvalue"); - String newvalue = mainMapJs.getString("newvalue"); - if (fieldnameMap.get(fielddesc) != null) { - mainlistMap.put("fielddesc", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(fieldnameMap.get(fielddesc).toString()), fieldnameMap.get(fielddesc).toString())); - } - if (valueMap.get(fielddesc) != null) { - JSONObject jsonObject = JSONObject.parseObject(valueMap.get(fielddesc).toString()); - String oldvalueStr = jsonObject.getString(oldvalue); - String newvalueStr = jsonObject.getString(newvalue); - if (StringUtils.isNotBlank(oldvalueStr)) { - mainlistMap.put("oldvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(oldvalueStr), oldvalue)); - } - if (StringUtils.isNotBlank(newvalueStr)) { - mainlistMap.put("newvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(newvalueStr), newvalue)); - } - } - } - } - - if (detaillist != null && detaillist.size() > 0 && fieldnameMap.size() > 0 && valueMap.size() > 0) { - for (Map detaillistMap : detaillist) { - JSONObject mainMapJs = JSONObject.parseObject(JSONObject.toJSONString(detaillistMap)); - String tablename = mainMapJs.getString("tablename"); - String fielddesc = mainMapJs.getString("fielddesc"); - String oldvalue = mainMapJs.getString("oldvalue"); - String newvalue = mainMapJs.getString("newvalue"); - if (tablenameMap.get(tablename) != null) { - detaillistMap.put("tablename", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(tablenameMap.get(tablename).toString()), tablenameMap.get(tablename).toString())); - } - if (fieldnameMap.get(fielddesc) != null) { - detaillistMap.put("fielddesc", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(fieldnameMap.get(fielddesc).toString()), fieldnameMap.get(fielddesc).toString())); - } - if (valueMap.get(fielddesc) != null) { - JSONObject jsonObject = JSONObject.parseObject(valueMap.get(fielddesc).toString()); - String oldvalueStr = jsonObject.getString(oldvalue); - String newvalueStr = jsonObject.getString(newvalue); - if (StringUtils.isNotBlank(oldvalueStr)) { - detaillistMap.put("oldvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(oldvalueStr), oldvalue)); - } - if (StringUtils.isNotBlank(newvalueStr)) { - detaillistMap.put("newvalue", ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(newvalueStr), newvalue)); - } - } - } - } - - } - - @Override - public List queryLogList(ELogGetLogParam param) { - LoggerContext context = new LoggerContext(); - context.setModuleName(param.getModule()); - context.setFunctionName(param.getFunction()); - int pagenum = Util.getIntValue(param.getCurrent(), 1) - 1; - int size = Util.getIntValue(param.getPageSize(), 10); - int start = pagenum * size; - int end = start + size; - Page page = new Page(pagenum, size); - String limit = " limit " + start + "," + (end - start); - - String tableName = ElogSeviceUtils.getTableName(param.getModule(), param.getFunction()); - List list = getLocalElogDaoMapper().queryElogList(page, context, null, tableName, null, "*"); - list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); - return switchString(list); - } - - @Override - public List queryCardLogList(String data) { - JSONObject map = JSONObject.parseObject(data); - String module = ""; - String function = ""; - String pageNum = ""; - String pageSize = ""; - String dataset = ""; - String searchMap = ""; - String sColum = ""; - String fColum = ""; - String transMethod = null; - List showColums = new ArrayList<>(); - List filterConditionDtos = new ArrayList<>(); - String authParams = ""; - Map jsonObject = new HashMap(); - if (map != null) { - module = map.getString("module"); - function = map.getString("function"); - pageNum = map.getString("pageNum"); - pageSize = map.getString("pageSize"); - //dataset = map.get("dataset").toString(); - searchMap = map.getString("searchMap"); - sColum = map.getString("showColums"); - showColums = JSONArray.parseArray(sColum, ShowColumsDto.class); - fColum = map.getString("filterConditions"); - transMethod = map.getString("transMethod"); - filterConditionDtos = JSONArray.parseArray(fColum, FilterConditionDto.class); - authParams = map.getString("authParams"); - jsonObject = JSONObject.parseObject(authParams); - } - LoggerContext context = new LoggerContext(); - context.setModuleName(module); - context.setFunctionName(function); - context.setTenant_key(getTenantKey().toLowerCase()); - // 分页 - //Page pages = ElogSeviceUtils.getPage(); - String sb = getQueryCondition(filterConditionDtos); - logger.info("elog查询条件拼接sql：{}", sb); - // 消费到消息,通过MethodHandler调用对应的方法 - String customSql = getCustomSql(transMethod, sb, "before"); - - Page pages = new Page(ElogSeviceUtils.getIntValue(pageNum, 1), ElogSeviceUtils.getIntValue(pageSize, 10)); - int page = Util.getIntValue(pages.getPageNum() + "", 1) - 1; - int size = Util.getIntValue(pages.getPageSize() + "", 10); - int start = page * size; - int end = start + size; - String limit = " limit " + start + "," + (end - start); - String tableName = ElogSeviceUtils.getTableName(module, function); - - //String columns = getshowColumsStr(showColums); - List list = new ArrayList<>(); - Map countMap = new HashMap<>(); - list = getLocalElogDaoMapper().queryElogList(pages, context, null, tableName, customSql, "*"); - countMap = getLocalElogDaoMapper().elogCount(context, tableName, customSql); - list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); - - if (list != null && list.size() > 0) { - //if ("1".equals(pageNum)){ - list.get(0).put("total", ElogSeviceUtils.getLongValue(countMap.get("counts") + "", 0)); - //} - } - transUserInfo(list); - //System.out.println("elog查询名称和头像耗时：{}"+ (l3-l2)); - transfLanguageData(list, showColums); - List res = switchString(list); - return res; - } - - /** - * 转换数据成多语言,结合前端转 - * - * @param lists - * @param showColums - */ - public static List transfLanguageData(List lists, List showColums) { - if (lists != null && lists.size() > 0) { - for (Map map : lists) { - if (map != null) { - Iterator> iterator = map.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = iterator.next(); - for (ShowColumsDto showColum : showColums) { - if (StringUtils.isNotBlank(showColum.getColumIndex()) && showColum.isTransfLanguage() && entry.getKey().equals(showColum.getColumIndex()) && !Objects.isNull(entry.getValue()) && StringUtils.isNumeric(entry.getValue().toString())) { - if (entry.getValue() instanceof Integer || entry.getValue() instanceof Long || entry.getValue() instanceof String) { - map.put(entry.getKey(), ElogSeviceSwitchUtils.transfLanguageLableid(ElogSeviceUtils.getLongValue(entry.getValue().toString()), entry.getValue().toString())); - } else { - //map.put(entry.getKey(), ElogSeviceSwitchUtils.handlerBaseDataMethod(entry.getValue().toString())); - map.put(entry.getKey(), entry.getValue()); - } - } else if (StringUtils.isNotBlank(showColum.getColumIndex()) && showColum.isTransfLanguage() && entry.getKey().equals(showColum.getColumIndex()) && !Objects.isNull(entry.getValue())) { - //read view add edit update delete - if ("add".equals(entry.getValue().toString()) || "创建".equals(entry.getValue().toString())) { - map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(1111111, "新增")); - } else if ("read".equals(entry.getValue().toString()) || "view".equals(entry.getValue().toString()) || "查看".equals(entry.getValue().toString())) { - map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(1111111, "查看")); - } else if ("edit".equals(entry.getValue().toString()) || "update".equals(entry.getValue().toString()) || "更新".equals(entry.getValue().toString())) { - map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(1111111, "修改")); - } else if ("delete".equals(entry.getValue().toString()) || "删除".equals(entry.getValue().toString())) { - map.put(entry.getKey(), SalaryI18nUtil.getI18nLabel(63254, "删除")); - } else if (entry.getValue().toString().contains("取消关联标签 ")) { - String val = entry.getValue().toString().replace("取消关联标签 ", SalaryI18nUtil.getI18nLabel(1111111, "取消关联标签 ") + " "); - map.put(entry.getKey(), val); - } else if (entry.getValue().toString().contains("关联标签 ")) { - String val = entry.getValue().toString().replace("关联标签 ", SalaryI18nUtil.getI18nLabel(1111111, "关联标签 ") + " "); - map.put(entry.getKey(), val); - } - } - } - } - } - } - } - return lists; - } - - - @Override - public Map countLog(String module, String function) { - LoggerContext context = new LoggerContext(); - context.setModuleName(module); - context.setFunctionName(function); - context.setTenant_key(getTenantKey()); - String tableName = ElogSeviceUtils.getTableName(module, function); - return getLocalElogDaoMapper().elogCount(context, tableName, null); - } - - @Override - public List queryDetailLogList(String module, String function, String current, String pageSize, String condition, String mainId) { - LoggerContext context = new LoggerContext(); - context.setModuleName(module); - context.setFunctionName(function); - context.setTenant_key(getTenantKey()); - context.setUuid(mainId); - int page = Util.getIntValue(current, 1) - 1; - int size = Util.getIntValue(pageSize, 10); - int start = page * size; - int end = start + size; - String limit = " limit " + start + "," + (end - start); - // 还需要支持下查询 - String tableName = ElogSeviceUtils.getTableName(module, function, true); - List list = getLocalElogDaoMapper().queryDetailElogList(context, limit, tableName, null); - list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); - return switchString(list); - } - - @Override - public Map countDestailLog(String module, String function, String mainId) { - LoggerContext context = new LoggerContext(); - context.setModuleName(module); - context.setFunctionName(function); - context.setTenant_key(getTenantKey()); - context.setUuid(mainId); - String tableName = ElogSeviceUtils.getTableName(module, function, true); - return getLocalElogDaoMapper().elogDetailCount(context, tableName, null); - } - - @Override - public WeaTable queryElogTraceInfo(String traceId, String module, String function, Integer currentPage, Integer pageSize, String traceTransMethod) { - WeaTable weaTable = new WeaTable(); - if (StringUtils.isNotEmpty(traceId)) { - String tableName = ElogSeviceUtils.getTableName(module, function); - Integer offset = (currentPage - 1) * pageSize; - List list = getLocalElogDaoMapper().queryElogTraceInfo(traceId, tableName, offset, pageSize); - for (Map map : list) { - if (map.get("modulename") != null) { - map.put("modulenamespan", ElogSeviceSwitchUtils.getModuleName(map.get("modulename").toString())); - } - } - //list = ElogSeviceSwitchUtils.getSwitchDatabaseData(list); - int count = getLocalElogDaoMapper().queryElogTraceInfoCount(traceId, tableName); - PageInfo pageInfo = SalaryPageUtil.buildPage(currentPage, pageSize, list); -// pageInfo.setColumns(); - pageInfo.setTotal(count); - } - - return weaTable; - } - - @Override - public List queryLogInfoByCustom(String module, String function, String field, String value, boolean isDetail) { - List list = new ArrayList(); - String tableName = ElogSeviceUtils.getTableName(module, function, isDetail); - if (StringUtils.isNotBlank(field) && StringUtils.isNotBlank(value)) { - StringBuffer sql = new StringBuffer(); - sql.append(field).append(" = '").append(value).append("' "); - - list = getLocalElogDaoMapper().queryLogInfoByCustom(tableName, sql.toString()); - } - return list; - } - - - @Override - public List queryLogInfoByCustom(String module, String function, String field, String value) { - return queryLogInfoByCustom(module, function, field, value, false); - } - - public List switchString(List list) { - if (list != null) { - return list.stream().map(m -> { - Set en = m.entrySet(); - for (Map.Entry entry : en) { - if (entry.getValue() != null) { - entry.setValue(String.valueOf(entry.getValue())); - } - } - return m; - }).collect(Collectors.toList()); - } else { - return list; - } - } - -// @Override -// public BatchDocumentMessage downloadLog(String data) { -// JSONObject jsonObject = JSONObject.parseObject(data); -// String module = jsonObject.getString("downloadmodule"); -// String function = jsonObject.getString("function"); -// String serviceName = jsonObject.getString("serviceName"); -// String fileName = jsonObject.getString("fileName"); -// String passWord = jsonObject.getString("passWord"); -// -// if (StringUtils.isEmpty(fileName)) { -// fileName = SalaryI18nUtil.getI18nLabel(191432, "日志记录"); -// } -// -// BatchDocumentMessage batchDocumentMessage = new BatchDocumentMessage(); -// WeaTable weaTable = queryLogs(data); -// List columns = weaTable.getColumns(); -// List headers = new ArrayList<>(); -// if (columns != null && !columns.isEmpty()) { -// for (WeaTableColumn column : columns) { -// Map header = new HashMap<>(); -// header.put("key", column.getDataIndex()); -// header.put("name", column.getTitle()); -// headers.add(header); -// } -// } -// List> dataList = weaTable.getData(); -// List> maps = new ArrayList<>(); -// if (dataList != null && !dataList.isEmpty()) { -// dataList.stream().forEach(m -> { -// Map map = new HashMap<>(); -// headers.stream().forEach(h -> { -// map.put(h.get("key").toString(), m.get(h.get("key"))); -// }); -// maps.add(map); -// }); -// } -// -// //必传--业务id -// batchDocumentMessage.setBizId(IdGenerator.generate() + ""); -// //必传-处理名称 -// batchDocumentMessage.setHandlerName("ebatchdemo"); -// //必传-服务名称 -// batchDocumentMessage.setServiceName(serviceName); -// //必传-数据类型 -// batchDocumentMessage.setDataType(fileName); -// //任务id -// batchDocumentMessage.setBatchTaskId(IdGenerator.generate()); -// //必传-模块 -// batchDocumentMessage.setModule(module); //com.weaver.teams.domain.EntityType 中的module（没有的话需要找温明刚维护下） -// //必传-功能 -// batchDocumentMessage.setFunction(function); -// //必传-eteamsid -// batchDocumentMessage.setEteamsId(TenantRpcContext.getEteamsId()); -// -// //非必传 -// if (StringUtils.isNotBlank(passWord)) { -// batchDocumentMessage.setPassword(passWord); -// } -// -// //必传 -// BatchFile batchFile = new BatchFile(); -// batchFile.setName(fileName); -// //必传 -// batchFile.setFileType(FileType.EXCEL); -// //必传 -// batchFile.setHandlerFileMethod(HandlerFileMethod.HANDLER_EXCEL_WITH_DATA); -// batchFile.setTemplateId(1l); -// List excelSheets = new ArrayList<>(); -// ExcelSheet excelSheet = new ExcelSheet(); -// -// excelSheet.setHeader(headers); -// excelSheet.setData(maps); -// excelSheet.setName(fileName); -// excelSheets.add(excelSheet); -// batchFile.setExcelSheets(excelSheets); -// batchDocumentMessage.setBatchFile(batchFile); -// batchDocumentMessage.setChunk(false);//不分片 -// batchExportSender.sendBatchExport(batchDocumentMessage); -// -// return batchDocumentMessage; -// } -// - - private String[] getESfields(String value) { - String[] split = value.split(","); - List list = new ArrayList<>(); - for (String s : split) { - switch (s.toLowerCase()) { - case "interfacename": - list.add("interfacename"); - break; - case "operatetype": - list.add("operatetype"); - break; - case "operatedesc": - list.add("operatedesc"); - break; - case "params": - list.add("params"); - break; - case "clientip": - list.add("clientip"); - break; - case "groupnamelabel": - list.add("groupnamelabel"); - break; - case "redoservice": - list.add("redoservice"); - break; - case "redocontext": - list.add("redocontext"); - break; - case "cancelservice": - list.add("cancelservice"); - break; - case "cancelcontext": - list.add("cancelcontext"); - break; - case "device": - list.add("device"); - break; - case "groupid": - list.add("groupid"); - break; - case "belongmainid": - list.add("belongmainid"); - break; - case "requesturl": - list.add("requesturl"); - break; - case "requesturi": - list.add("requesturi"); - break; - case "log_result": - list.add("logResult"); - break; - case "fromterminal": - list.add("fromterminal"); - break; - case "resultdesc": - list.add("resultdesc"); - break; - case "old_content": - list.add("oldContent"); - break; - case "link_type": - list.add("linkType"); - break; - } - } - //list转为数组 - if (list.size() > 0) { - String[] strings = list.toArray(new String[list.size()]); - return strings; - } - return null; - } - -} diff --git a/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java b/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java deleted file mode 100644 index 63e188956..000000000 --- a/src/com/engine/salary/elog/threadlocal/ElogThreadLocal.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.engine.salary.elog.threadlocal; - -import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.entity.dto.LoggerContext; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Date: 2022/5/18 20:26 - * @Author: deli.xu - * @Description: - **/ -public class ElogThreadLocal { - - private static final ThreadLocal> loggerContextList = new ThreadLocal<>(); - private static final ThreadLocal requestBody = new ThreadLocal<>(); - - public static LoggerContext currentLoggerContext() { - List list = loggerContextList.get(); - - if(list == null || list.size() == 0) { - return null; - } else { - return list.get(list.size() -1); - } - } - - public static void addLoggerContext(LoggerContext loggerContext) { - if(loggerContext == null) - return; - List list = loggerContextList.get(); - if(list == null) { - list = new ArrayList<>(); - loggerContextList.set(list); - } - - list.add(loggerContext); - - } - - public static List getLoggerContextList() { - return loggerContextList.get(); - } - - public static void clear() { - loggerContextList.set(null); - } - - public static void removeLast() { - List list = loggerContextList.get(); - - if(list != null) { - int size = list.size(); - if(size > 0) - list.remove(size - 1); - } - } - - public static void remove() { - loggerContextList.remove(); - } - - public static JSONObject getRequestBody() { - return requestBody.get(); - } - - public static void setRequestBody(JSONObject json) { - requestBody.set(json); - } - - public static void removeRequestBody() { - requestBody.remove(); - } -} diff --git a/src/com/engine/salary/elog/util/ElogServiceUtils.java b/src/com/engine/salary/elog/util/ElogServiceUtils.java deleted file mode 100644 index fb2ecafc6..000000000 --- a/src/com/engine/salary/elog/util/ElogServiceUtils.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.engine.salary.elog.util; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.entity.dto.ElogBean; -import com.engine.salary.elog.entity.dto.FilterConditionDto; -import com.engine.salary.elog.entity.dto.ShowColumsDto; -import com.engine.salary.elog.enums.ElogConsts; - -import java.util.List; -import java.util.Map; - -/** - * @Date: 2022/5/18 19:19 - * @Author: deli.xu - * @Description: elog服务工具类 - **/ -public class ElogServiceUtils { - - public static String getTableName(String module, String function) { - return getTableName(module, function, false); - } - - public static String getTableName(String module, String function, boolean isDetail) { - String tablename = module + ElogConsts.TABLE_SPACER + function + ElogConsts.TABLE_SUFFIX + (isDetail ? ElogConsts.DETAIL_TABLE_SUFFIX : ""); - sqlCheck(tablename); - return tablename; - } - - public static void sqlCheck(String value) { - if (value != null) { - if (!value.matches("^[A-Za-z][a-zA-Z0-9_\\.,]{0,31}$")) { - throw new RuntimeException("sqlCheck failed ! value :" + value); - } - } - } - - public static ElogBean getElogBean(String data) { - JSONObject datas = JSONObject.parseObject(data); - ElogBean elogBean = new ElogBean(); - String module = datas.getString("module"); - String function = datas.getString("function"); - String pageNum = datas.getString("current"); - String pageSize = datas.getString("pageSize"); - String searchMap = datas.getString("searchMap"); - String transMethod = datas.getString("transMethod"); - String authParams = datas.getString("authParams"); - String showColums = datas.getString("showColums"); - String filterConditions = datas.getString("filterConditions"); - String downloadSize = datas.getString("downloadSize"); - List showColumsDtos = JSONArray.parseArray(showColums, ShowColumsDto.class); - List filterConditionDtos = JSONArray.parseArray(filterConditions, FilterConditionDto.class); - Map authParamsJson = JSONObject.parseObject(authParams); - elogBean.setModule(module); - elogBean.setFunction(function); - elogBean.setCurrent(pageNum); - elogBean.setPageSize(pageSize); - elogBean.setSearchMap(searchMap); - elogBean.setTransMethod(transMethod); - elogBean.setDownloadSize(downloadSize); - elogBean.setShowColumns(showColumsDtos); - elogBean.setFilterConditionDtos(filterConditionDtos); - elogBean.setAuthParamsJson(authParamsJson); - return elogBean; - } - - public static int getIntValue(String v) { - return getIntValue(v, -1); - } - - public static int getIntValue(String v, int def) { - try { - return Integer.parseInt(v); - } catch (Exception var3) { - return def; - } - } - - public static long getLongValue(String v) { - return getLongValue(v, -1l); - } - - public static long getLongValue(String v, long def) { - try { - return Long.parseLong(v); - } catch (Exception var3) { - return def; - } - } - - -} diff --git a/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java b/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java deleted file mode 100644 index 78a78dc94..000000000 --- a/src/com/engine/salary/elog/util/ElogSeviceSwitchUtils.java +++ /dev/null @@ -1,1402 +0,0 @@ -package com.engine.salary.elog.util; - -import cn.hutool.core.map.CaseInsensitiveMap; -import com.alibaba.druid.proxy.jdbc.ClobProxyImpl; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.cloudstore.eccom.pc.table.WeaTable; -import com.cloudstore.eccom.pc.table.WeaTableColumn; -import com.engine.salary.elog.annotation.OperateType; -import com.engine.salary.elog.enums.ElogConsts; -import com.engine.salary.util.SalaryI18nUtil; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import weaver.conn.RecordSet; - -import java.sql.Clob; -import java.util.*; - -/** - * @Date: 2022/5/18 19:34 - * @Author: deli.xu - * @Description: elog服务转换类 - **/ -public class ElogSeviceSwitchUtils { - - private static final Logger logger = LoggerFactory.getLogger(ElogSeviceSwitchUtils.class); - // TODO 后续需要考虑多语言label写法 - public static final Map moduleMap = new HashMap<>(); - - private static final Map> moduleFuctionMap = new HashMap<>(); - - static { - /*moduleMap.put("elog", SalaryI18nUtil.getI18nLabel(62975, ElogSeviceUtils.currentLanguage(), "日志")); - moduleMap.put("report", SalaryI18nUtil.getI18nLabel(62976, ElogSeviceUtils.currentLanguage(), "报表")); - moduleMap.put("edc", SalaryI18nUtil.getI18nLabel(62977, ElogSeviceUtils.currentLanguage(), "数据中心")); - moduleMap.put("hrm", SalaryI18nUtil.getI18nLabel(62978, ElogSeviceUtils.currentLanguage(), "人力资源")); - moduleMap.put("crm", SalaryI18nUtil.getI18nLabel(62979, ElogSeviceUtils.currentLanguage(), "资产")); - moduleMap.put("demo", SalaryI18nUtil.getI18nLabel(62980, ElogSeviceUtils.currentLanguage(), "示例")); - moduleMap.put("attc", SalaryI18nUtil.getI18nLabel(62981, ElogSeviceUtils.currentLanguage(), "出勤打卡")); - moduleMap.put("attm", SalaryI18nUtil.getI18nLabel(62982, ElogSeviceUtils.currentLanguage(), "出勤机")); - moduleMap.put("attw", SalaryI18nUtil.getI18nLabel(62983, ElogSeviceUtils.currentLanguage(), "出勤报表")); - moduleMap.put("auth", SalaryI18nUtil.getI18nLabel(62984, ElogSeviceUtils.currentLanguage(), "系统权限")); - moduleMap.put("bank", SalaryI18nUtil.getI18nLabel(62985, ElogSeviceUtils.currentLanguage(), "银企直联")); - moduleMap.put("bap", SalaryI18nUtil.getI18nLabel(62986, ElogSeviceUtils.currentLanguage(), "云办公")); - moduleMap.put("base", SalaryI18nUtil.getI18nLabel(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); - moduleMap.put("batc", SalaryI18nUtil.getI18nLabel(62988, ElogSeviceUtils.currentLanguage(), "导入导出")); - moduleMap.put("blog", SalaryI18nUtil.getI18nLabel(62989, ElogSeviceUtils.currentLanguage(), "日报微博")); - moduleMap.put("cld", SalaryI18nUtil.getI18nLabel(62990, ElogSeviceUtils.currentLanguage(), "日程管理")); - moduleMap.put("cmca", SalaryI18nUtil.getI18nLabel(62991, ElogSeviceUtils.currentLanguage(), "资金管理")); - moduleMap.put("cmcl", SalaryI18nUtil.getI18nLabel(62992, ElogSeviceUtils.currentLanguage(), "线索管理")); - moduleMap.put("cmco", SalaryI18nUtil.getI18nLabel(62993, ElogSeviceUtils.currentLanguage(), "联系人管理")); - moduleMap.put("cmcp", SalaryI18nUtil.getI18nLabel(62994, ElogSeviceUtils.currentLanguage(), "对手管理")); - moduleMap.put("cmcu", SalaryI18nUtil.getI18nLabel(62995, ElogSeviceUtils.currentLanguage(), "客户管理")); - moduleMap.put("cmex", SalaryI18nUtil.getI18nLabel(62996, ElogSeviceUtils.currentLanguage(), "批量操作")); - moduleMap.put("cmmk", SalaryI18nUtil.getI18nLabel(62997, ElogSeviceUtils.currentLanguage(), "营销管理")); - moduleMap.put("cmor", SalaryI18nUtil.getI18nLabel(62998, ElogSeviceUtils.currentLanguage(), "订单管理")); - moduleMap.put("cmpc", SalaryI18nUtil.getI18nLabel(62999, ElogSeviceUtils.currentLanguage(), "价格管理")); - moduleMap.put("cmpr", SalaryI18nUtil.getI18nLabel(63000, ElogSeviceUtils.currentLanguage(), "产品管理")); - moduleMap.put("cmpt", SalaryI18nUtil.getI18nLabel(63001, ElogSeviceUtils.currentLanguage(), "外部门户")); - moduleMap.put("cmqu", SalaryI18nUtil.getI18nLabel(63002, ElogSeviceUtils.currentLanguage(), "报价管理")); - moduleMap.put("cmsa", SalaryI18nUtil.getI18nLabel(63003, ElogSeviceUtils.currentLanguage(), "商机管理")); - moduleMap.put("cmtr", SalaryI18nUtil.getI18nLabel(63004, ElogSeviceUtils.currentLanguage(), "合同管理")); - moduleMap.put("comp", SalaryI18nUtil.getI18nLabel(63005, ElogSeviceUtils.currentLanguage(), "文档对比")); - moduleMap.put("cs", SalaryI18nUtil.getI18nLabel(63006, ElogSeviceUtils.currentLanguage(), "云商店")); - moduleMap.put("cowork", SalaryI18nUtil.getI18nLabel(63007, ElogSeviceUtils.currentLanguage(), "协作区")); - moduleMap.put("dbs", SalaryI18nUtil.getI18nLabel(63008, ElogSeviceUtils.currentLanguage(), "文档公共模块")); - moduleMap.put("dcad", SalaryI18nUtil.getI18nLabel(63009, ElogSeviceUtils.currentLanguage(), "数据中心运行")); - moduleMap.put("dcap", SalaryI18nUtil.getI18nLabel(63010, ElogSeviceUtils.currentLanguage(), "数据中心分析开发配置")); - moduleMap.put("dcrd", SalaryI18nUtil.getI18nLabel(63011, ElogSeviceUtils.currentLanguage(), "数据中心开发配置")); - moduleMap.put("dcre", SalaryI18nUtil.getI18nLabel(63012, ElogSeviceUtils.currentLanguage(), "数据中心分析生产运行")); - moduleMap.put("dcs", SalaryI18nUtil.getI18nLabel(63013, ElogSeviceUtils.currentLanguage(), "文档目录模块")); - moduleMap.put("dds", SalaryI18nUtil.getI18nLabel(63014, ElogSeviceUtils.currentLanguage(), "文档模块")); - moduleMap.put("dps", SalaryI18nUtil.getI18nLabel(63015, ElogSeviceUtils.currentLanguage(), "文档权限模块")); - moduleMap.put("drle", SalaryI18nUtil.getI18nLabel(63016, ElogSeviceUtils.currentLanguage(), "数据规则库")); - moduleMap.put("ds", SalaryI18nUtil.getI18nLabel(63017, ElogSeviceUtils.currentLanguage(), "数据安全")); - moduleMap.put("dw_etl", SalaryI18nUtil.getI18nLabel(63018, ElogSeviceUtils.currentLanguage(), "ETL(抽取，转换，治理）")); - moduleMap.put("dw_model", SalaryI18nUtil.getI18nLabel(63019, ElogSeviceUtils.currentLanguage(), "建模服务")); - moduleMap.put("dw_process", SalaryI18nUtil.getI18nLabel(63020, ElogSeviceUtils.currentLanguage(), "计算服务")); - moduleMap.put("dw_search", SalaryI18nUtil.getI18nLabel(63021, ElogSeviceUtils.currentLanguage(), "查询服务")); - moduleMap.put("dw_sync", SalaryI18nUtil.getI18nLabel(63022, ElogSeviceUtils.currentLanguage(), "数据抽取")); - moduleMap.put("eb", SalaryI18nUtil.getI18nLabel(63023, ElogSeviceUtils.currentLanguage(), "云桥")); - moduleMap.put("ebda", SalaryI18nUtil.getI18nLabel(62987, ElogSeviceUtils.currentLanguage(), "应用管理")); - moduleMap.put("ebdd", SalaryI18nUtil.getI18nLabel(63024, ElogSeviceUtils.currentLanguage(), "页面设计")); - moduleMap.put("ebdf", SalaryI18nUtil.getI18nLabel(63025, ElogSeviceUtils.currentLanguage(), "表单服务")); - moduleMap.put("ebdp", SalaryI18nUtil.getI18nLabel(63026, ElogSeviceUtils.currentLanguage(), "页面管理")); - moduleMap.put("ecod", SalaryI18nUtil.getI18nLabel(63027, ElogSeviceUtils.currentLanguage(), "ecode")); - moduleMap.put("ei", SalaryI18nUtil.getI18nLabel(63028, ElogSeviceUtils.currentLanguage(), "数据导出导入")); - moduleMap.put("em", SalaryI18nUtil.getI18nLabel(63029, ElogSeviceUtils.currentLanguage(), "移动相关")); - moduleMap.put("es", SalaryI18nUtil.getI18nLabel(63030, ElogSeviceUtils.currentLanguage(), "微搜搜索")); - moduleMap.put("esa", SalaryI18nUtil.getI18nLabel(63031, ElogSeviceUtils.currentLanguage(), "微搜文件分析")); - moduleMap.put("esb", SalaryI18nUtil.getI18nLabel(63032, ElogSeviceUtils.currentLanguage(), "ESB")); - moduleMap.put("esch", SalaryI18nUtil.getI18nLabel(63033, ElogSeviceUtils.currentLanguage(), "计划任务")); - moduleMap.put("esd", SalaryI18nUtil.getI18nLabel(63034, ElogSeviceUtils.currentLanguage(), "微搜索引数据")); - moduleMap.put("exfo", SalaryI18nUtil.getI18nLabel(63035, ElogSeviceUtils.currentLanguage(), "excel函数引擎")); - moduleMap.put("fbdg", SalaryI18nUtil.getI18nLabel(63036, ElogSeviceUtils.currentLanguage(), "预算编制")); - moduleMap.put("fdt", SalaryI18nUtil.getI18nLabel(63037, ElogSeviceUtils.currentLanguage(), "表单数据")); - moduleMap.put("fexs", SalaryI18nUtil.getI18nLabel(63038, ElogSeviceUtils.currentLanguage(), "费用管理")); - moduleMap.put("file", SalaryI18nUtil.getI18nLabel(63039, ElogSeviceUtils.currentLanguage(), "文件服务")); - moduleMap.put("finc", SalaryI18nUtil.getI18nLabel(63040, ElogSeviceUtils.currentLanguage(), "微报账")); - moduleMap.put("fnar", SalaryI18nUtil.getI18nLabel(63041, ElogSeviceUtils.currentLanguage(), "财务报表")); - moduleMap.put("fomo", SalaryI18nUtil.getI18nLabel(63042, ElogSeviceUtils.currentLanguage(), "表单监控")); - moduleMap.put("form", SalaryI18nUtil.getI18nLabel(63043, ElogSeviceUtils.currentLanguage(), "表单服务")); - moduleMap.put("frpt", SalaryI18nUtil.getI18nLabel(63043, ElogSeviceUtils.currentLanguage(), "业务表单")); - moduleMap.put("fvou", SalaryI18nUtil.getI18nLabel(63044, ElogSeviceUtils.currentLanguage(), "凭证集成")); - moduleMap.put("hp", SalaryI18nUtil.getI18nLabel(63045, ElogSeviceUtils.currentLanguage(), "门户")); - moduleMap.put("hr", SalaryI18nUtil.getI18nLabel(63046, ElogSeviceUtils.currentLanguage(), "人事档案")); - moduleMap.put("ic", SalaryI18nUtil.getI18nLabel(63047, ElogSeviceUtils.currentLanguage(), "集成服务")); - moduleMap.put("il", SalaryI18nUtil.getI18nLabel(63048, ElogSeviceUtils.currentLanguage(), "集成登录")); - moduleMap.put("im", SalaryI18nUtil.getI18nLabel(63049, ElogSeviceUtils.currentLanguage(), "IM相关服务")); - moduleMap.put("inc", SalaryI18nUtil.getI18nLabel(63050, ElogSeviceUtils.currentLanguage(), "发票云服务")); - moduleMap.put("iua", SalaryI18nUtil.getI18nLabel(63051, ElogSeviceUtils.currentLanguage(), "统一认证")); - moduleMap.put("iut", SalaryI18nUtil.getI18nLabel(63052, ElogSeviceUtils.currentLanguage(), "统一待办")); - moduleMap.put("mail", SalaryI18nUtil.getI18nLabel(63053, ElogSeviceUtils.currentLanguage(), "邮件服务")); - moduleMap.put("mc", SalaryI18nUtil.getI18nLabel(63054, ElogSeviceUtils.currentLanguage(), "消息服务")); - moduleMap.put("mt", SalaryI18nUtil.getI18nLabel(63055, ElogSeviceUtils.currentLanguage(), "会议管理")); - moduleMap.put("my", SalaryI18nUtil.getI18nLabel(63056, ElogSeviceUtils.currentLanguage(), "关注&收藏&标签")); - moduleMap.put("odoc", SalaryI18nUtil.getI18nLabel(63057, ElogSeviceUtils.currentLanguage(), "公文管理")); - moduleMap.put("odoc_exchange", SalaryI18nUtil.getI18nLabel(63058, ElogSeviceUtils.currentLanguage(), "公文交换平台")); - moduleMap.put("open", SalaryI18nUtil.getI18nLabel(63059, ElogSeviceUtils.currentLanguage(), "开放平台")); - moduleMap.put("pr", SalaryI18nUtil.getI18nLabel(63060, ElogSeviceUtils.currentLanguage(), "工作画像")); - moduleMap.put("proj", SalaryI18nUtil.getI18nLabel(63061, ElogSeviceUtils.currentLanguage(), "项目管理")); - moduleMap.put("prt", SalaryI18nUtil.getI18nLabel(63062, ElogSeviceUtils.currentLanguage(), "打印服务")); - moduleMap.put("pspt", SalaryI18nUtil.getI18nLabel(63063, ElogSeviceUtils.currentLanguage(), "系统登录")); - moduleMap.put("rptc", SalaryI18nUtil.getI18nLabel(63064, ElogSeviceUtils.currentLanguage(), "数据协作")); - moduleMap.put("rpts", SalaryI18nUtil.getI18nLabel(63065, ElogSeviceUtils.currentLanguage(), "上报调查")); - moduleMap.put("sala", SalaryI18nUtil.getI18nLabel(63066, ElogSeviceUtils.currentLanguage(), "薪资管理")); - moduleMap.put("sign", SalaryI18nUtil.getI18nLabel(63067, ElogSeviceUtils.currentLanguage(), "印控中心")); - moduleMap.put("sms", SalaryI18nUtil.getI18nLabel(63068, ElogSeviceUtils.currentLanguage(), "短信")); - moduleMap.put("task", SalaryI18nUtil.getI18nLabel(63069, ElogSeviceUtils.currentLanguage(), "任务管理")); - moduleMap.put("tnt", SalaryI18nUtil.getI18nLabel(63070, ElogSeviceUtils.currentLanguage(), "租户管理")); - moduleMap.put("wf", SalaryI18nUtil.getI18nLabel(63071, ElogSeviceUtils.currentLanguage(), "路径定义")); - moduleMap.put("wfc", SalaryI18nUtil.getI18nLabel(63072, ElogSeviceUtils.currentLanguage(), "流程流转")); - moduleMap.put("wfr", SalaryI18nUtil.getI18nLabel(63073, ElogSeviceUtils.currentLanguage(), "流程规则路由")); - moduleMap.put("wrgm", SalaryI18nUtil.getI18nLabel(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); - moduleMap.put("wrgp", SalaryI18nUtil.getI18nLabel(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); - moduleMap.put("wrpr", SalaryI18nUtil.getI18nLabel(63076, ElogSeviceUtils.currentLanguage(), "计划报告")); - moduleMap.put("doc", SalaryI18nUtil.getI18nLabel(63077, ElogSeviceUtils.currentLanguage(), "文档服务")); - moduleMap.put("placard", SalaryI18nUtil.getI18nLabel(63078, ElogSeviceUtils.currentLanguage(), "团队公告")); - moduleMap.put("fna", SalaryI18nUtil.getI18nLabel(135042, ElogSeviceUtils.currentLanguage(), "云报销")); - moduleMap.put("meeting", SalaryI18nUtil.getI18nLabel(63080, ElogSeviceUtils.currentLanguage(), "会议")); - moduleMap.put("wfp", SalaryI18nUtil.getI18nLabel(63081, ElogSeviceUtils.currentLanguage(), "流程")); - moduleMap.put("portal", SalaryI18nUtil.getI18nLabel(63045, ElogSeviceUtils.currentLanguage(), "门户")); - moduleMap.put("workreport", SalaryI18nUtil.getI18nLabel(63082, ElogSeviceUtils.currentLanguage(), "工作报告")); - moduleMap.put("goal", SalaryI18nUtil.getI18nLabel(63074, ElogSeviceUtils.currentLanguage(), "目标管理")); - moduleMap.put("performance", SalaryI18nUtil.getI18nLabel(63075, ElogSeviceUtils.currentLanguage(), "绩效考核")); - moduleMap.put("intlogin", SalaryI18nUtil.getI18nLabel(63083, ElogSeviceUtils.currentLanguage(), "集成登录设置")); - moduleMap.put("i18n", SalaryI18nUtil.getI18nLabel(64559, ElogSeviceUtils.currentLanguage(), "国际化")); - moduleMap.put("timecard", SalaryI18nUtil.getI18nLabel(63085, ElogSeviceUtils.currentLanguage(), "出勤")); - moduleMap.put("market", SalaryI18nUtil.getI18nLabel(63086, ElogSeviceUtils.currentLanguage(), "营销")); - moduleMap.put("excelformula", SalaryI18nUtil.getI18nLabel(64560, ElogSeviceUtils.currentLanguage(), "函数服务")); - moduleMap.put("ic_ldap", SalaryI18nUtil.getI18nLabel(70081, ElogSeviceUtils.currentLanguage(), "Ldap集成")); - moduleMap.put("iut_c_c", SalaryI18nUtil.getI18nLabel(70303, ElogSeviceUtils.currentLanguage(), "统一待办推送设置")); - moduleMap.put("plan", SalaryI18nUtil.getI18nLabel(70303, ElogSeviceUtils.currentLanguage(), "计划报告")); - moduleMap.put("document", SalaryI18nUtil.getI18nLabel(34218, ElogSeviceUtils.currentLanguage(), "文档")); - moduleMap.put("taskCustStatus", SalaryI18nUtil.getI18nLabel(73988, ElogSeviceUtils.currentLanguage(), "任务状态")); - moduleMap.put("project", SalaryI18nUtil.getI18nLabel(55158, ElogSeviceUtils.currentLanguage(), "项目")); - moduleMap.put("calendar", SalaryI18nUtil.getI18nLabel(74186, ElogSeviceUtils.currentLanguage(), "日历")); - moduleMap.put("web", SalaryI18nUtil.getI18nLabel(75598, ElogSeviceUtils.currentLanguage(), "浏览")); - moduleMap.put("formdatareport", SalaryI18nUtil.getI18nLabel(76068, ElogSeviceUtils.currentLanguage(), "来自上报数据")); - moduleMap.put("mainline", SalaryI18nUtil.getI18nLabel(31898, ElogSeviceUtils.currentLanguage(), "主线")); - moduleMap.put("customer", SalaryI18nUtil.getI18nLabel(32726, ElogSeviceUtils.currentLanguage(), "客户")); - moduleMap.put("contract", SalaryI18nUtil.getI18nLabel(32864, ElogSeviceUtils.currentLanguage(), "合同")); - moduleMap.put("group", SalaryI18nUtil.getI18nLabel(19426, ElogSeviceUtils.currentLanguage(), "分组")); - moduleMap.put("workflow", SalaryI18nUtil.getI18nLabel(81851, ElogSeviceUtils.currentLanguage(), "工作流程")); - moduleMap.put("biaoge", SalaryI18nUtil.getI18nLabel(30919, ElogSeviceUtils.currentLanguage(), "表格")); - moduleMap.put("clue", SalaryI18nUtil.getI18nLabel(28908, ElogSeviceUtils.currentLanguage(), "线索")); - moduleMap.put("competitor", SalaryI18nUtil.getI18nLabel(81852, ElogSeviceUtils.currentLanguage(), "竞争对手")); - moduleMap.put("kpiFlow", SalaryI18nUtil.getI18nLabel(81853, ElogSeviceUtils.currentLanguage(), "kpil流程")); - moduleMap.put("mainlineCustStatus", SalaryI18nUtil.getI18nLabel(81854, ElogSeviceUtils.currentLanguage(), "主线客户状态")); - moduleMap.put("marketactivity", SalaryI18nUtil.getI18nLabel(34221, ElogSeviceUtils.currentLanguage(), "市场活动")); - moduleMap.put("mtPhase", SalaryI18nUtil.getI18nLabel(81855, ElogSeviceUtils.currentLanguage(), "mt阶段")); - moduleMap.put("production", SalaryI18nUtil.getI18nLabel(29329, ElogSeviceUtils.currentLanguage(), "产品")); - moduleMap.put("quote", SalaryI18nUtil.getI18nLabel(34231, ElogSeviceUtils.currentLanguage(), "报价")); - moduleMap.put("saleChance", SalaryI18nUtil.getI18nLabel(32863, ElogSeviceUtils.currentLanguage(), "商机")); - moduleMap.put("orderform", SalaryI18nUtil.getI18nLabel(34230, ElogSeviceUtils.currentLanguage(), "订单")); - moduleMap.put("contact", SalaryI18nUtil.getI18nLabel(32711, ElogSeviceUtils.currentLanguage(), "联系人")); - moduleMap.put("price", SalaryI18nUtil.getI18nLabel(31922, ElogSeviceUtils.currentLanguage(), "价格")); - moduleMap.put("capital", SalaryI18nUtil.getI18nLabel(83428, ElogSeviceUtils.currentLanguage(), "资金")); - moduleMap.put("ice", SalaryI18nUtil.getI18nLabel(94360, ElogSeviceUtils.currentLanguage(), "日程会议集成")); - moduleMap.put("ic_hr", SalaryI18nUtil.getI18nLabel(84284, ElogSeviceUtils.currentLanguage(), "HR同步")); - moduleMap.put("intunifyauth", SalaryI18nUtil.getI18nLabel(84467, ElogSeviceUtils.currentLanguage(), "统一认证接入管理")); - moduleMap.put("signcenter", SalaryI18nUtil.getI18nLabel(84691, ElogSeviceUtils.currentLanguage(), "电子签")); - moduleMap.put("iut_s_c", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办-异构系统")); - moduleMap.put("iut_s_c1", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统")); - moduleMap.put("iut_s_c2", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办中心")); - moduleMap.put("iut_s_c3", SalaryI18nUtil.getI18nLabel(91503, ElogSeviceUtils.currentLanguage(), "统一待办-应用系统-流程类型")); - moduleMap.put("ic_mail", SalaryI18nUtil.getI18nLabel(100715, ElogSeviceUtils.currentLanguage(), "邮箱集成")); - moduleMap.put("hrsa", SalaryI18nUtil.getI18nLabel(105038, ElogSeviceUtils.currentLanguage(), "薪酬管理")); - moduleMap.put("icc", SalaryI18nUtil.getI18nLabel(113884, ElogSeviceUtils.currentLanguage(), "转换规则")); - moduleMap.put("basicserver", SalaryI18nUtil.getI18nLabel(113885, ElogSeviceUtils.currentLanguage(), "整体基础")); - moduleMap.put("dw", SalaryI18nUtil.getI18nLabel(115549, ElogSeviceUtils.currentLanguage(), "数据仓库")); - moduleMap.put("msg", SalaryI18nUtil.getI18nLabel(115563, ElogSeviceUtils.currentLanguage(), "工作消息")); - moduleMap.put("intunifybase", SalaryI18nUtil.getI18nLabel(115599, ElogSeviceUtils.currentLanguage(), "统一认证服务")); - moduleMap.put("esearch", SalaryI18nUtil.getI18nLabel(21694, ElogSeviceUtils.currentLanguage(), "全文检索")); - moduleMap.put("iaauthserver", SalaryI18nUtil.getI18nLabel(115603, ElogSeviceUtils.currentLanguage(), "统一认证注册应用")); - moduleMap.put("excel", SalaryI18nUtil.getI18nLabel(115543, ElogSeviceUtils.currentLanguage(), "excel函数")); - moduleMap.put("scene", SalaryI18nUtil.getI18nLabel(115539, ElogSeviceUtils.currentLanguage(), "绘图")); - moduleMap.put("bcw", SalaryI18nUtil.getI18nLabel(115651, ElogSeviceUtils.currentLanguage(), "公共模块")); - moduleMap.put("folder", SalaryI18nUtil.getI18nLabel(10734, ElogSeviceUtils.currentLanguage(), "文件夹")); - moduleMap.put("pdfcnv", SalaryI18nUtil.getI18nLabel(115957, ElogSeviceUtils.currentLanguage(), "PDF转换服务")); - moduleMap.put("ebform", SalaryI18nUtil.getI18nLabel(121462, ElogSeviceUtils.currentLanguage(), "e-Builder表单")); - moduleMap.put("statistics", SalaryI18nUtil.getI18nLabel(17745, ElogSeviceUtils.currentLanguage(), "自定义统计")); - moduleMap.put("edcapp", SalaryI18nUtil.getI18nLabel(121631, ElogSeviceUtils.currentLanguage(), "多级填报")); - - */ - - moduleMap.put("elog", 62975); - moduleMap.put("report", 62976); - moduleMap.put("edc", 52689); - moduleMap.put("hrm", 62978); - moduleMap.put("crm", 62979); - moduleMap.put("demo", 62980); - moduleMap.put("attc", 62981); - moduleMap.put("attm", 62982); - moduleMap.put("attw", 62983); - moduleMap.put("auth", 62984); - moduleMap.put("bank", 62985); - moduleMap.put("bap", 62986); - moduleMap.put("base", 62987); - moduleMap.put("batc", 62988); - moduleMap.put("blog", 62989); - moduleMap.put("cld", 62990); - moduleMap.put("cmca", 62991); - moduleMap.put("cmcl", 62992); - moduleMap.put("cmco", 62993); - moduleMap.put("cmcp", 62994); - moduleMap.put("cmcu", 62995); - moduleMap.put("cmex", 62996); - moduleMap.put("cmmk", 62997); - moduleMap.put("cmor", 62998); - moduleMap.put("cmpc", 62999); - moduleMap.put("cmpr", 63000); - moduleMap.put("cmpt", 63001); - moduleMap.put("cmqu", 63002); - moduleMap.put("cmsa", 63003); - moduleMap.put("cmtr", 63004); - moduleMap.put("comp", 63005); - moduleMap.put("cs", 63006); - moduleMap.put("cowork", 63007); - moduleMap.put("dbs", 63008); - moduleMap.put("dcad", 63009); - moduleMap.put("dcap", 63010); - moduleMap.put("dcrd", 63011); - moduleMap.put("dcre", 63012); - moduleMap.put("dcs", 63013); - moduleMap.put("dds", 63014); - moduleMap.put("dps", 63015); - moduleMap.put("drle", 63016); - moduleMap.put("ds", 63017); - moduleMap.put("dw_etl", 63018); - moduleMap.put("dw_model", 63019); - moduleMap.put("dw_process", 63020); - moduleMap.put("dw_search", 63021); - moduleMap.put("dw_sync", 63022); - moduleMap.put("eb", 63023); - moduleMap.put("ebda", 62987); - moduleMap.put("ebdd", 63024); - moduleMap.put("ebdf", 63025); - moduleMap.put("ebdp", 63026); - moduleMap.put("ecod", 63027); - moduleMap.put("ei", 63028); - moduleMap.put("em", 63029); - moduleMap.put("es", 63030); - moduleMap.put("esa", 63031); - moduleMap.put("esb", 63032); - moduleMap.put("esch", 63033); - moduleMap.put("esd", 63034); - moduleMap.put("exfo", 63035); - moduleMap.put("fbdg", 63036); - moduleMap.put("fdt", 63037); - moduleMap.put("fexs", 63038); - moduleMap.put("file", 63039); - moduleMap.put("finc", 63040); - moduleMap.put("fnar", 63041); - moduleMap.put("fomo", 63042); - moduleMap.put("form", 63043); - moduleMap.put("frpt", 63043); - moduleMap.put("fvou", 63044); - moduleMap.put("hp", 63045); - moduleMap.put("hr", 63046); - moduleMap.put("ic", 63047); - moduleMap.put("il", 63048); - moduleMap.put("im", 63049); - moduleMap.put("inc", 63050); - moduleMap.put("iua", 63051); - moduleMap.put("iut", 63052); - moduleMap.put("mail", 63053); - moduleMap.put("mc", 63054); - moduleMap.put("mt", 63055); - moduleMap.put("my", 63056); - moduleMap.put("odoc", 63057); - moduleMap.put("odoc_exchange", 63058); - moduleMap.put("open", 63059); - moduleMap.put("pr", 63060); - moduleMap.put("proj", 63061); - moduleMap.put("prt", 63062); - moduleMap.put("pspt", 63063); - moduleMap.put("rptc", 63064); - moduleMap.put("rpts", 63065); - moduleMap.put("sala", 63066); - moduleMap.put("sign", 63067); - moduleMap.put("sms", 63068); - moduleMap.put("task", 63069); - moduleMap.put("tnt", 63070); - moduleMap.put("wf", 63071); - moduleMap.put("wfc", 63072); - moduleMap.put("wfr", 63073); - moduleMap.put("wrgm", 63074); - moduleMap.put("wrgp", 63075); - moduleMap.put("wrpr", 63076); - moduleMap.put("doc", 63077); - moduleMap.put("placard", 63078); - moduleMap.put("fna", 135042); - moduleMap.put("meeting", 63080); - moduleMap.put("wfp", 63081); - moduleMap.put("portal", 63045); - moduleMap.put("workreport", 63082); - moduleMap.put("goal", 63074); - moduleMap.put("performance", 63075); - moduleMap.put("intlogin", 63083); - moduleMap.put("i18n", 64559); - moduleMap.put("timecard", 63085); - moduleMap.put("market", 63086); - moduleMap.put("excelformula", 64560); - moduleMap.put("ebatch", 69280); - moduleMap.put("ic_ldap", 70081); - moduleMap.put("iut_c_c", 96493); - moduleMap.put("plan", 63076); - moduleMap.put("document", 34218); - moduleMap.put("taskCustStatus", 73988); - moduleMap.put("calendar", 74186); - moduleMap.put("batch", 69280); - moduleMap.put("project", 55158); - moduleMap.put("web", 75598); - moduleMap.put("formdatareport", 76068); - moduleMap.put("mainline", 31898); - moduleMap.put("customer", 32726); - moduleMap.put("contract", 32864); - moduleMap.put("group", 19426); - moduleMap.put("workflow", 81851); - moduleMap.put("biaoge", 30919); - moduleMap.put("clue", 28908); - moduleMap.put("competitor", 81852); - moduleMap.put("kpiFlow", 81853); - moduleMap.put("mainlineCustStatus", 81854); - moduleMap.put("marketactivity", 34221); - moduleMap.put("mtPhase", 81855); - moduleMap.put("production", 29329); - moduleMap.put("quote", 34231); - moduleMap.put("saleChance", 32863); - moduleMap.put("orderform", 34230); - moduleMap.put("contact", 32711); - moduleMap.put("price", 31922); - moduleMap.put("capital", 83428); - moduleMap.put("ice", 87722); - moduleMap.put("ic_hr", 84284); - moduleMap.put("intunifyauth", 84508); - moduleMap.put("signcenter", 84691); - moduleMap.put("iut_s_c", 91503); - moduleMap.put("iut_s_c1", 95218); - moduleMap.put("iut_s_c2", 95219); - moduleMap.put("iut_s_c3", 95220); - moduleMap.put("iut_c_log", 96494); - moduleMap.put("ic_mail", 100715); - moduleMap.put("hrsa", 105038); - moduleMap.put("icc", 113884); - moduleMap.put("basicserver", 113885); - moduleMap.put("dw", 115549); - moduleMap.put("msg", 115563); - moduleMap.put("intunifybase", 115599); - moduleMap.put("esearch", 21694); - moduleMap.put("iaauthserver", 115603); - moduleMap.put("excel", 115543); - moduleMap.put("scene", 115539); - moduleMap.put("bcw", 115651); - moduleMap.put("folder", 10734); - moduleMap.put("pdfcnv", 115957); - moduleMap.put("login", 63063); - moduleMap.put("ebform", 121462); - moduleMap.put("statistics", 17745); - moduleMap.put("edcapp", 121631); - moduleMap.put("cusapp", 16381); - moduleMap.put("e10-allinone-base", 141083); - moduleMap.put("voice", 142713); - moduleMap.put("filter", 147832); - moduleMap.put("ias", 146674); - moduleMap.put("device", 153666); - moduleMap.put("meetingTopic", 180274); - moduleMap.put("meetingService", 180276); - moduleMap.put("meetingDecision", 180277); - moduleMap.put("meetingSign", 180278); - moduleMap.put("meetingSignSet", 61601); - moduleMap.put("meetingMember", 180280); - moduleMap.put("meetingShare", 180281); - moduleMap.put("int", 40031); - moduleMap.put("print", 160051); - moduleMap.put("wcwIconUpdate", 182661); - moduleMap.put("wcwIconRelease", 183123); - moduleMap.put("wcwIconUse", 183124); - moduleMap.put("wcw", 29385); - moduleMap.put("component", 115651); - moduleMap.put("ic_exchange", 87722); - moduleMap.put("iut_c_c", 240048); - moduleMap.put("iut_c_set", 240049); - - Map elogMap = new HashMap<>(); - Map reportMap = new HashMap<>(); - Map edcMap = new HashMap<>(); - Map hrmMap = new HashMap<>(); - Map crmMap = new HashMap<>(); - Map demoMap = new HashMap<>(); - - moduleFuctionMap.put("elog", elogMap); - moduleFuctionMap.put("report", reportMap); - moduleFuctionMap.put("edc", edcMap); - moduleFuctionMap.put("hrm", hrmMap); - moduleFuctionMap.put("crm", crmMap); - moduleFuctionMap.put("demo", demoMap); - - - elogMap.put("operator", "日志操作"); - elogMap.put("reportcusinfo", "报表自定义"); - edcMap.put("dataset", "数据集合"); - - demoMap.put("reportcusinfo", "报表自定义字段"); - } - - /** - * 获取模块名称 - * - * @param module - * @return - */ - public static String getModuleName(String module) { -// String modulename = ElogSeviceUtils.null2String(moduleMap.get(module), module); -// return ElogSeviceUtils.isLongValue(modulename) ? SalaryI18nUtil.getI18nLabel(ElogSeviceUtils.getLongValue(modulename), modulename) : modulename; - return module; - } - - /** - * 获取模块名称 - * - * @param module - * @return - */ - public static String getModuleNamePapi(String module) { -// String modulename = ElogSeviceUtils.null2String(moduleMap.get(module), module); -// return ElogSeviceUtils.isLongValue(modulename) ? SalaryI18nUtil.getI18nLabel(ElogSeviceUtils.getLongValue(modulename), modulename) : modulename; - return module; - } - - - /** - * 获取方法名称 - * - * @param module - * @param function - * @return - */ - public static String getFunctionName(String module, String function) { -// Map functionMap = moduleFuctionMap.get(module); -// -// if (functionMap != null) -// function = ElogSeviceUtils.null2String(functionMap.get(function), function); -// -// return ElogSeviceUtils.isLongValue(function) ? SalaryI18nUtil.getI18nLabel(ElogSeviceUtils.getLongValue(function), function) : function; - return function; - } - - public static void switchValues(List resultMap, List recordColumns) { - - switchValues(resultMap, recordColumns, false); - - } - - - public static void switchValues(List list, List recordColumns, boolean islocal) { -// if(!islocal) { -// changKey2Lower(list); -// } - for (Map map : list) { - Iterator> iterator = map.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry next = iterator.next(); - for (String recordColumn : recordColumns) { - if (next.getKey().equals(recordColumn) && next.getValue() instanceof String) { - map.put(next.getKey(), transfi18Method(next.getValue())); - } - } - } - map.put("modulenamespan", getModuleName(map.get("modulename"))); - //map.put("functionnamespan", getFunctionName(map.get("modulename"), map.get("functionname"))); - //switchDatabaseField(map); - } - - } - - public static void switchDatabaseField(Map map) { - map.put("date", map.get("log_date")); - map.put("operator", map.get("log_operator")); - map.put("result", map.get("log_result")); - } - - /** - * 转换数据成多语言 - * - * @param lists - */ - public static List transfLanguageData(List lists) { - if (lists != null && lists.size() > 0) { - for (Map map : lists) { - if (map != null) { - Iterator> iterator = map.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = iterator.next(); - if (entry.getValue() instanceof Integer || entry.getValue() instanceof Long || entry.getValue() instanceof String) { - map.put(entry.getKey(), transfLanguageLableid(ElogSeviceUtils.getLongValue(entry.getValue().toString()), entry.getValue().toString())); - } else { - map.put(entry.getKey(), entry.getValue()); - } - } - } - } - } - return lists; - } - - public static String transfi18Method(String str) { - if ("新增".equals(str)) { - return transfLanguageLableid(63252l, str); - } else if ("查看".equals(str)) { - return transfLanguageLableid(55172l, str); - } else if ("修改".equals(str)) { - return transfLanguageLableid(63253l, str); - } else if ("更新".equals(str)) { - return transfLanguageLableid(29540l, str); - } else if ("删除".equals(str)) { - return transfLanguageLableid(63254l, str); - } else if (StringUtils.isNumeric(str) && str.length() < 10) { - return transfLanguageLableid(Long.parseLong(str), str); - } else { - return str; - } - } - - public static String transfLanguageLableid(Long lableid) { - return SalaryI18nUtil.getI18nLabel(Integer.parseInt(lableid.toString()), lableid.toString()); - } - - /** - * 转换多语言 - * - * @param lableid - * @param def - * @return - */ - public static String transfLanguageLableid(Long lableid, String def) { - return SalaryI18nUtil.getI18nLabel(Integer.parseInt(lableid.toString()), def); - } - - - /** - * 日志本地服务-更新明细转换 - * - * @param mainlist - * @param list - * @return - */ - public static Map switchChangeValue(List mainlist, List list) { - Map res = new HashMap<>(); - StringBuilder valuesChange = new StringBuilder(); - List valuesChanges = new ArrayList<>(); - String values = ""; - String operatetypeName = ""; - int oldCount = 0; - int newCount = 0; - String operatetype = ""; - CaseInsensitiveMap map = null; - if (list != null && list.size() > 0) { - for (Map hashmap : list) { - map = new CaseInsensitiveMap<>(hashmap); - Object obj = map.get("operatetype"); - if (obj != null) { - operatetype = obj.toString(); - } - } - } - if (mainlist != null && mainlist.size() > 0) { - for (Map hashMap : mainlist) { - map = new CaseInsensitiveMap<>(hashMap); - Object isdetail = map.get("isdetail"); - if (isdetail != null) { - if (StringUtils.isBlank(isdetail.toString()) || !"0".equals(isdetail.toString())) { - continue; - } - } else { - continue; - } - Object oldvalue = map.get("oldvalue"); - if (oldvalue != null) { - if (StringUtils.isNotBlank(oldvalue.toString())) { - oldCount++; - } - } - - Object newvalue = map.get("newvalue"); - if (newvalue != null) { - if (StringUtils.isNotBlank(newvalue.toString())) { - newCount++; - } - } - - } - } - CaseInsensitiveMap jo = null; - for (int i = 0; i < mainlist.size(); i++) { - Map jomap = mainlist.get(i); - jo = new CaseInsensitiveMap<>(jomap); - String fieldName = jo.get("fielddesc"); - String oldvalue = obj2String(jo.get("oldvalue")); - String oldrealvalue = obj2String(jo.get("oldrealvalue")); - String newValue = obj2String(jo.get("newvalue")); - String newrealvalue = obj2String(jo.get("newrealvalue")); - // oracle.sql.CLOB类型处理 - jomap.put("oldvalue", oldvalue); - jomap.put("oldrealvalue", oldrealvalue); - jomap.put("newvalue", newValue); - jomap.put("newrealvalue", newrealvalue); - - String fieldNameLabelId = jo.get("fieldnamelabelid"); - if (StringUtils.isNotBlank(fieldNameLabelId) && StringUtils.isNumeric(fieldNameLabelId)) { - fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId), fieldName); - } else if (StringUtils.isNotBlank(fieldNameLabelId) && !StringUtils.isNumeric(fieldNameLabelId) && !"-1".equals(fieldNameLabelId)) { - fieldName = fieldNameLabelId; - } else if (StringUtils.isNotBlank(fieldName) && StringUtils.isNumeric(fieldName)) { - fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldName), fieldName); - } - if (StringUtils.isNotBlank(oldrealvalue) && StringUtils.isNumeric(oldrealvalue)) { - oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue), oldvalue); - } else if (StringUtils.isNotBlank(oldrealvalue) && !StringUtils.isNumeric(oldrealvalue)) { - oldvalue = oldrealvalue; - } - if (StringUtils.isNotBlank(newrealvalue) && StringUtils.isNumeric(newrealvalue)) { - newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue), newValue); - } else if (StringUtils.isNotBlank(newrealvalue) && !StringUtils.isNumeric(newrealvalue)) { - newValue = newrealvalue; - } - - //oldvalue,newValue 避免xss漏洞 分别进行转义 -// oldvalue = StringConversionForXSS(oldvalue); -// newValue = StringConversionForXSS(newValue); - - if (oldCount != 0) { - valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); - - } else if (oldCount == 0 || newCount == 0 || operatetype.startsWith(OperateType.add) || operatetype.startsWith(OperateType.delete)) { - valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); - - } else { - valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); - } - //} - /*if (valuesChange.length() > 3) { - values = valuesChange.substring(0, valuesChange.length() - 3); - }*/ - } - - res.put("valueschanges", valuesChanges); - res.put("detailcontexts", mainlist); - return res; - } - - private static String obj2String(Object o) { - if (o == null) { - return ""; - } - if (o instanceof String) { - return (String) o; - } - return JSON.toJSONString(o); - } - - /** - * 服务中心结果集转换 - */ - public static void switchChangeValues(List list) { - CaseInsensitiveMap map = null; - for (Map hashMap : list) { - map = new CaseInsensitiveMap<>(hashMap); - int count = 0; - StringBuilder valuesChange = new StringBuilder(); - List valuesChanges = new ArrayList(); - Object detailContexts = map.get("detailcontexts"); - if (detailContexts != null) { - JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject jo = jsonArray.getJSONObject(i); - String isDetail = jo.getString("isDetail"); - if (StringUtils.isBlank(isDetail) || !"0".equals(isDetail)) { - continue; - } - String oldvalue = jo.getString("oldValue"); - if (StringUtils.isNotBlank(oldvalue)) { - count++; - } - } - } - - if (detailContexts != null) { - JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(detailContexts)); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject jo = jsonArray.getJSONObject(i); - String isDetail = jo.getString("isDetail"); - if (StringUtils.isBlank(isDetail) || !"0".equals(isDetail)) { - continue; - } - String fieldName = jo.getString("fieldDesc"); - String oldvalue = jo.getString("oldValue"); - String oldrealvalue = jo.getString("oldRealValue"); - String newValue = jo.getString("newValue"); - String newrealvalue = jo.getString("newRealValue"); - String fieldNameLabelId = jo.getString("fieldNameLabelId"); - if (StringUtils.isNotBlank(fieldNameLabelId) && StringUtils.isNumeric(fieldNameLabelId)) { - fieldName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldNameLabelId)); - } - if (StringUtils.isNotBlank(oldrealvalue) && StringUtils.isNumeric(oldrealvalue)) { - oldvalue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldrealvalue)); - } - if (StringUtils.isNotBlank(newrealvalue) && StringUtils.isNumeric(newrealvalue)) { - newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue)); - } - if (count == 0) { - valuesChanges.add(String.format(valueChangeNewFormat(), fieldName, newValue)); - } else { - valuesChanges.add(String.format(valueChangeFormat(), fieldName, oldvalue, newValue)); - } - - } - /*String values = ""; - if (valuesChange.length() > 3) { - values = valuesChange.substring(0, valuesChange.length() - 3); - }*/ - - map.put("valueschanges", valuesChanges); - } - - } - } - - public static String valueChangeNewFormat() { - return "【%s】：%s"; - } - - public static String valueChangeFormat() { - return "【%s】：" + SalaryI18nUtil.getI18nLabel(61695, "由") + - "[%s] " + SalaryI18nUtil.getI18nLabel(61697, "改为") + " [%s]"; - } - - public static void changKey2Lower(List list) { - - List newList = new ArrayList<>(); - for (Map orgMap : list) { - Map resultMap = new HashMap<>(); - - if (orgMap == null || orgMap.isEmpty()) { - newList.add(resultMap); - continue; - } - - Set keySet = orgMap.keySet(); - for (String key : keySet) { - resultMap.put(key != null ? key.toLowerCase() : "", orgMap.get(key)); - } - newList.add(resultMap); - } - list.clear(); - list.addAll(newList); - } - - /** - * 查看详细表的数据 - * - * @param list - */ - public static Map switchDetailChangeValue(List list) { - Map res = new HashMap<>(); - List> lists = new ArrayList<>(); - HashMap repeatTableName = new HashMap<>(); - CaseInsensitiveMap map = null; - for (Map hashMap : list) { - map = new CaseInsensitiveMap<>(hashMap); - List detailmap = new ArrayList<>(); - HashMap detailoldMap = new HashMap<>(); - detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); - detailoldMap.put("dataid", map.get("dataid")); - HashMap detailnewMap = new HashMap<>(); - detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); - detailnewMap.put("dataid", map.get("dataid")); - detailmap.add(detailoldMap); - detailmap.add(detailnewMap); - WeaTable wea = new WeaTable(); - wea.getColumns().add(new WeaTableColumn("5%",SalaryI18nUtil.getI18nLabel(63250, "操作"), "operator")); -// wea.getColumns().add(new WeaTableColumn("dataid", "dataid", true)); - Object tablename = map.get("tablename"); - Object tablenamelabelid = map.get("tablenamelabelid"); - if (tablenamelabelid != null) { - if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { - tablename = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); - } - } - Map m = new HashMap<>(); - if (tablename != null && StringUtils.isNotBlank(tablename.toString())) { - String temptablename = repeatTableName.get(tablename.toString()); - if (tablename.toString().equals(temptablename)) { - continue; - } - repeatTableName.put(tablename.toString(), tablename.toString()); - m.put("tablename", tablename.toString()); - m.put("detailmap", detailmap); - m.put("column", wea); - lists.add(m); - } else { - tablename = tablename != null ? tablename : ""; - String temptablename = repeatTableName.get(tablename.toString()); - if (tablename.toString().equals(temptablename)) { - continue; - } - repeatTableName.put(tablename.toString(), tablename.toString()); - m.put("tablename", ""); - m.put("detailmap", detailmap); - m.put("column", wea); - lists.add(m); - } - } - - for (Map hashMap : list) { - map = new CaseInsensitiveMap<>(hashMap); - Object isDetail = map.get("isdetail"); - if (isDetail != null) { - if ("0".equals(isDetail.toString())) { - continue; - } - } else { - continue; - } - String title = ""; - String dataIndex = ""; - String oldValue = ""; - String newValue = ""; - String tableName = ""; - String dataId = ""; - - Object fieldDesc = map.get("fielddesc"); - if (fieldDesc != null) { - if (StringUtils.isNotBlank(fieldDesc.toString())) { - title = fieldDesc.toString(); - } - } - - Object fieldnamelabelid = map.get("fieldnamelabelid"); - if (fieldnamelabelid != null) { - if (StringUtils.isNotBlank(fieldnamelabelid.toString()) && StringUtils.isNumeric(fieldnamelabelid.toString())) { - title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); - } - } - - Object fieldName = map.get("fieldname"); - if (fieldName != null) { - if (StringUtils.isNotBlank(fieldName.toString())) { - dataIndex = fieldName.toString(); - } - } - Object oValue = map.get("oldvalue"); - if (oValue != null) { - if (StringUtils.isNotBlank(oValue.toString())) { - oldValue = oValue.toString(); - } - } - Object nValue = map.get("newvalue"); - if (nValue != null) { - if (StringUtils.isNotBlank(nValue.toString())) { - newValue = nValue.toString(); - } - } - Object oldRealValue = map.get("oldrealvalue"); - if (oldRealValue != null) { - if (StringUtils.isNotBlank(oldRealValue.toString()) && StringUtils.isNumeric(oldRealValue.toString())) { - oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); - } - } - - Object newrealvalue = map.get("newrealvalue"); - if (newrealvalue != null) { - if (StringUtils.isNotBlank(newrealvalue.toString()) && StringUtils.isNumeric(newrealvalue.toString())) { - newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); - } - } - - Object tablename = map.get("tablename"); - if (StringUtils.isNotBlank(tablename.toString())) { - tableName = tablename.toString(); - } else { - tableName = ""; - } - Object tablenamelabelid = map.get("tablenamelabelid"); - if (tablenamelabelid != null) { - if (tablenamelabelid != null) { - if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { - tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); - } - } - } - Object dataid = map.get("dataid"); - if (StringUtils.isNotBlank(dataid.toString())) { - dataId = dataid.toString(); - } else { - dataId = ""; - } - for (Map m : lists) { - Object o = m.get("tablename"); - if (o != null) { - if (tableName.equals(o)) { - List details = (List) m.get("detailmap"); - List newDetails = new ArrayList<>(); - if (details != null && details.size() > 0) { - for (Map detail : details) { - Object data_id = detail.get("dataid"); - if (data_id != null) { - if (dataId.equals(data_id)) { - Object operator = detail.get("operator"); - if (operator != null) { - if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { - detail.put(dataIndex, oldValue); - } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { - detail.put(dataIndex, newValue); - } - } - } else { - if (newDetails.size() > 2) { - for (Map newDetail : newDetails) { - if (dataId.equals(newDetail.get("dataid"))) { - Object operator = detail.get("operator"); - if (operator != null) { - if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { - detail.put(dataIndex, oldValue); - } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { - detail.put(dataIndex, newValue); - } - } - } else { - HashMap detailoldMap = new HashMap<>(); - detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); - detailoldMap.put("dataid", map.get("dataid")); - detailoldMap.put(dataIndex, oldValue); - HashMap detailnewMap = new HashMap<>(); - detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); - detailnewMap.put("dataid", map.get("dataid")); - detailnewMap.put(dataIndex, newValue); - newDetails.add(detailoldMap); - newDetails.add(detailnewMap); - } - } - } else if (newDetails.size() == 0) { - int count = 0; - for (Map mapdetail : details) { - Object dataid_ = mapdetail.get("dataid"); - if (dataid_ != null && dataid_.equals(dataId)) { - count++; - } - } - if (count == 0) { - HashMap detailoldMap = new HashMap<>(); - detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); - detailoldMap.put("dataid", map.get("dataid")); - detailoldMap.put(dataIndex, oldValue); - HashMap detailnewMap = new HashMap<>(); - detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); - detailnewMap.put("dataid", map.get("dataid")); - detailnewMap.put(dataIndex, newValue); - newDetails.add(detailoldMap); - newDetails.add(detailnewMap); - } - } - } - } - } - } - if (newDetails.size() > 0) { - details.addAll(newDetails); - newDetails.clear(); - } - - WeaTable column = (WeaTable) m.get("column"); - if (column != null) { - List columns = column.getColumns(); - if (columns != null && columns.size() > 0) { - Boolean flag = true; - for (Object object : columns) { - WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); - if (weaTableColumn != null) { - String title1 = weaTableColumn.getText(); - if (title.equals(title1)) { - flag = false; - break; - } - } - } - if (flag) { - column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); - m.put("column", column); - } - } - } - } - } - } - } - res.put("detail", lists); - return res; - } - - - public static void switchDetailChangeValues(List list) { - for (Map map : list) { - Map repeatTableName = new HashMap<>(); - List detailContexts = (List) map.get("detailcontexts"); - List lists = new ArrayList<>(); - if (detailContexts != null) { - for (Map detailContext : detailContexts) { - List detailmap = new ArrayList<>(); - HashMap detailoldMap = new HashMap<>(); - detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); - detailoldMap.put("dataid", detailContext.get("dataid")); - HashMap detailnewMap = new HashMap<>(); - detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); - detailnewMap.put("dataid", detailContext.get("dataid")); - detailmap.add(detailoldMap); - detailmap.add(detailnewMap); - WeaTable wea = new WeaTable(); - wea.getColumns().add(new WeaTableColumn(SalaryI18nUtil.getI18nLabel(63250, "操作"), "operator", "5%")); -// wea.getColumns().add(new WeaTableColumn("dataid", "dataid", true)); - Object tableName = detailContext.get("tableName"); - Object tablenamelabelid = detailContext.get("tableNameLabelId"); - if (tablenamelabelid != null) { - if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { - tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); - } - } - Map m = new HashMap<>(); - if (StringUtils.isNotBlank(tableName.toString())) { - String temptablename = repeatTableName.get(tableName.toString()); - if (tableName.toString().equals(temptablename)) { - continue; - } - repeatTableName.put(tableName.toString(), tableName.toString()); - m.put("tablename", tableName.toString()); - m.put("detailmap", detailmap); - m.put("column", wea); - lists.add(m); - map.put("detail", lists); - } else { - String temptablename = repeatTableName.get(tableName.toString()); - if (tableName.toString().equals(temptablename)) { - continue; - } - repeatTableName.put(tableName.toString(), tableName.toString()); - m.put("tablename", ""); - m.put("detailmap", detailmap); - m.put("column", wea); - lists.add(m); - map.put("detail", lists); - } - } - } - List details = (List) map.get("detail"); - if (details != null) { - int size = details.size(); - int start = 0; - while (start < size) { - start++; - - for (int i = 0; i < size; i++) { - Map detail = details.get(i); - - //for (Map detail : details) { - if (details.size() > size) { - break; - } - for (Map detailContext : detailContexts) { - Object isDetail = detailContext.get("isDetail"); - if (isDetail != null) { - if ("0".equals(isDetail.toString())) { - continue; - } - } else { - continue; - } - String title = ""; - String dataIndex = ""; - String oldValue = ""; - String newValue = ""; - String tableName = ""; - String dataId = ""; - Object fieldDesc = detailContext.get("fieldDesc"); - if (StringUtils.isNotBlank(fieldDesc.toString())) { - title = fieldDesc.toString(); - } - Object fieldnamelabelid = detailContext.get("fieldNameLabelId"); - if (fieldnamelabelid != null) { - if (StringUtils.isNotBlank(fieldnamelabelid.toString()) && StringUtils.isNumeric(fieldnamelabelid.toString())) { - title = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(fieldnamelabelid.toString())); - } - } - Object fieldName = detailContext.get("fieldName"); - if (StringUtils.isNotBlank(fieldName.toString())) { - dataIndex = fieldName.toString(); - } - Object oValue = detailContext.get("oldValue"); - if (StringUtils.isNotBlank(oValue.toString())) { - oldValue = oValue.toString(); - } - Object nValue = detailContext.get("newValue"); - if (StringUtils.isNotBlank(nValue.toString())) { - newValue = nValue.toString(); - } - Object oldRealValue = detailContext.get("oldRealValue"); - if (oldRealValue != null) { - if (StringUtils.isNotBlank(oldRealValue.toString()) && StringUtils.isNumeric(oldRealValue.toString())) { - oldValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(oldRealValue.toString())); - } - } - - Object newrealvalue = detailContext.get("newRealValue"); - if (newrealvalue != null) { - if (StringUtils.isNotBlank(newrealvalue.toString()) && StringUtils.isNumeric(newrealvalue.toString())) { - newValue = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(newrealvalue.toString())); - } - } - Object tablename = detailContext.get("tableName"); - if (StringUtils.isNotBlank(tablename.toString())) { - tableName = tablename.toString(); - } else { - tableName = ""; - } - Object tablenamelabelid = detailContext.get("tableNameLabelId"); - if (tablenamelabelid != null) { - if (tablenamelabelid != null) { - if (StringUtils.isNotBlank(tablenamelabelid.toString()) && StringUtils.isNumeric(tablenamelabelid.toString())) { - tableName = ElogSeviceSwitchUtils.transfLanguageLableid(Long.parseLong(tablenamelabelid.toString())); - } - } - } - Object dataid = detailContext.get("dataid"); - if (StringUtils.isNotBlank(dataid.toString())) { - dataId = dataid.toString(); - } else { - dataId = ""; - } - Object detailtablename = detail.get("tablename"); - if (detailtablename != null) { - if (tableName.equals(detailtablename.toString())) { - List detailmap = (List) detail.get("detailmap"); - List newDetails = new ArrayList<>(); - if (detailmap != null && detailmap.size() > 0) { - for (Map d : detailmap) { - Object data_id = d.get("dataid"); - if (data_id != null) { - if (dataId.equals(data_id)) { - Object operator = d.get("operator"); - if (operator != null) { - if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { - d.put(dataIndex, oldValue); - } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { - d.put(dataIndex, newValue); - } - } - } else { - if (newDetails.size() > 2) { - for (Map newDetail : newDetails) { - if (dataId.equals(newDetail.get("dataid"))) { - Object operator = d.get("operator"); - if (operator != null) { - if (SalaryI18nUtil.getI18nLabel(63248, "操作(旧)").equals(operator.toString())) { - d.put(dataIndex, oldValue); - } else if (SalaryI18nUtil.getI18nLabel(63249, "操作(新)").equals(operator.toString())) { - d.put(dataIndex, newValue); - } - } - } else { - HashMap detailoldMap = new HashMap<>(); - detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); - detailoldMap.put("dataid", detailContext.get("dataid")); - detailoldMap.put(dataIndex, oldValue); - HashMap detailnewMap = new HashMap<>(); - detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); - detailnewMap.put("dataid", detailContext.get("dataid")); - detailnewMap.put(dataIndex, newValue); - newDetails.add(detailoldMap); - newDetails.add(detailnewMap); - } - } - } else if (newDetails.size() == 0) { - int count = 0; - for (Map mapdetail : detailmap) { - Object dataid_ = mapdetail.get("dataid"); - if (dataid_ != null && dataid_.equals(dataId)) { - count++; - } - } - if (count == 0) { - HashMap detailoldMap = new HashMap<>(); - detailoldMap.put("operator", SalaryI18nUtil.getI18nLabel(63248, "操作(旧)")); - detailoldMap.put("dataid", detailContext.get("dataid")); - detailoldMap.put(dataIndex, oldValue); - HashMap detailnewMap = new HashMap<>(); - detailnewMap.put("operator", SalaryI18nUtil.getI18nLabel(63249, "操作(新)")); - detailnewMap.put("dataid", detailContext.get("dataid")); - detailnewMap.put(dataIndex, newValue); - newDetails.add(detailoldMap); - newDetails.add(detailnewMap); - } - } - } - } - } - } - if (newDetails.size() > 0) { - details.addAll(newDetails); - newDetails.clear(); - //detailmap = new ArrayList<>(); - //detail.put("detailmap", detailmap); - } - - WeaTable column = (WeaTable) detail.get("column"); - if (column != null) { - List columns = column.getColumns(); - if (columns != null && columns.size() > 0) { - Boolean flag = true; - for (Object object : columns) { - WeaTableColumn weaTableColumn = JSONObject.parseObject(JSON.toJSONString(object), WeaTableColumn.class); - if (weaTableColumn != null) { - String title1 = weaTableColumn.getText(); - if (title.equals(title1)) { - flag = false; - break; - } else { - flag = true; - } - } - } - if (flag) { - column.getColumns().add(new WeaTableColumn(title, dataIndex, "5%")); - detail.put("column", column); - } - } - } - } - } - } - } - } - } - } - } - - public static List getSwitchDatabaseData(List list) { - String databaseId = new RecordSet().getDBType(); - if (ElogConsts.ORACLE.equalsIgnoreCase(databaseId) || ElogConsts.SQLSERVER.equalsIgnoreCase(databaseId)) { - List arrayList = new ArrayList<>(); - for (Map map : list) { - Set en = map.entrySet(); - Map hashMap = new HashMap<>(); - for (Map.Entry entry : en) { - Object key = entry.getKey(); - Object val = null; - if ("PARAMS".equalsIgnoreCase(key.toString()) || "CUSTOMINFO".equalsIgnoreCase(key.toString()) - || entry.getValue() instanceof ClobProxyImpl || entry.getValue() instanceof Clob) { - val = JSONObject.toJSON(entry.getValue()); - } else { - val = entry.getValue(); - } - hashMap.put(key.toString().toLowerCase(), val); - } - switchDatabaseField(hashMap); - arrayList.add(hashMap); - } - return arrayList; - } else { - for (Map map : list) { - switchDatabaseField(map); - } - return list; - } - } - - public static List getSwitchDatabaseAnalysisData(List list, Map keys) { - String databaseId = new RecordSet().getDBType(); - if (!ElogConsts.MYSQL.equalsIgnoreCase(databaseId)) { - List arrayList = new ArrayList<>(); - - for (Map map : list) { - Set en = map.entrySet(); - Map hashMap = new HashMap<>(); - for (Map.Entry entry : en) { - Object key = entry.getKey(); - Object val = entry.getValue(); - if (key.toString().equalsIgnoreCase(keys.get(key.toString().toLowerCase()))) { - key = keys.get(key.toString().toLowerCase()); - } else { - key = key.toString().toLowerCase(); - } - hashMap.put(key.toString(), val); - } - arrayList.add(hashMap); - } - return arrayList; - } - return list; - } - - /** - * 获取多个模块名称 - * - * @param modules - * @return - */ - public static Map getModuleNames(List modules) { - Map hashMap = new HashMap<>(); - if (modules == null || modules.size() == 0) { - return hashMap; - } - for (String module : modules) { - String modulenum = ElogSeviceUtils.null2String(moduleMap.get(module), module); - String modulename = ElogSeviceUtils.isLongValue(modulenum) ? SalaryI18nUtil.getI18nLabel(Integer.parseInt(modulenum), modulenum) : modulenum; - hashMap.put(module, modulename); - } - return hashMap; - - } - -// private static String StringConversionForXSS(String str) { -// if (StringUtils.isBlank(str)) -// return str; -// //判断是否是json串 是json串的话也直接返回 -// if (isJSONString(str)) -// return str; -// // 判断是否为前端标签类型字符串或带< 或 >的字符串，用false方法 /<(\\w+)[^>]*>(.*?<\\/\\1>)?/ -// Pattern pattern = Pattern.compile("[<>]"); -// Matcher matcher = pattern.matcher(str); -// if (matcher.find()) -// return SecurityUtil.encodeForHtml(str, false); -// //都不是则用true方法 -// return SecurityUtil.encodeForHtml(str, true); -// -// } - - - /** - * 判断是否为json字符串 - * - * @param content - * @return - */ - public static boolean isJSONString(String content) { - if (StringUtils.isEmpty(content)) { - return false; - } - if (!content.startsWith("{") || !content.endsWith("}")) { - if (!content.startsWith("[") || !content.endsWith("]")) { - return false; - } - } - try { - JSONObject.parse(content); - return true; - } catch (Exception e) { - return false; - } - } - - public static List getNameModule(String module) { - if (StringUtils.isBlank(module)) { - return new ArrayList<>(); - } - Map> dataMap = new HashMap<>(); - moduleMap.forEach((k, v) -> { - List list = new ArrayList<>(); - Integer moduleCode = moduleMap.get(k); - String htmlLabelName = SalaryI18nUtil.getI18nLabel(moduleCode, ""); - if (dataMap.containsKey(htmlLabelName)) { - list = dataMap.get(htmlLabelName); - list.add(k); - } else { - list.add(k); - } - dataMap.put(htmlLabelName, list); - }); - return Objects.isNull(dataMap.get(module)) ? Arrays.asList(module) : dataMap.get(module); - } -} diff --git a/src/com/engine/salary/elog/util/ElogSeviceUtils.java b/src/com/engine/salary/elog/util/ElogSeviceUtils.java deleted file mode 100644 index 58ca9ec31..000000000 --- a/src/com/engine/salary/elog/util/ElogSeviceUtils.java +++ /dev/null @@ -1,528 +0,0 @@ -package com.engine.salary.elog.util; - -import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.enums.FromTerminalType; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.http.HttpServletRequest; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -/** - * @Date: 2022/5/18 23:34 - * @Author: deli.xu - * @Description: elog服务工具类 - **/ -public class ElogSeviceUtils { - - private static final Logger logger = LoggerFactory.getLogger(ElogSeviceUtils.class); - - /*@Autowired - private ComInfoCache comInfoCache; - private static ComInfoCache baseComInfoCache; - - @PostConstruct - public void init() { - baseComInfoCache = comInfoCache; - }*/ - - private static final String TABLE_SPACER = "_"; - private static final String TABLE_SUFFIX = "logs"; - private static final String DETAIL_TABLE_SUFFIX = "_detail"; - public static final String BASE_TABLE = "BASE_ELOG_TABLE"; - - - public static String getTableName(String module, String function) { - return getTableName(module, function, false); - } - - public static String getTableName(String module, String function, boolean isDetail) { - String tablename = module + TABLE_SPACER + function + TABLE_SUFFIX + (isDetail ? DETAIL_TABLE_SUFFIX : ""); -// SecurityUtil.sqlCheck(tablename); - return tablename; - } - - /** - * String 转枚举 - * - * @param c - * @param string - * @param - * @return - */ - public static > T getEnumFromString(Class c, String string) { - if (c != null && string != null) { - try { - return Enum.valueOf(c, string.trim().toUpperCase()); - } catch (IllegalArgumentException ex) { - } - } - return null; - } - - /** - * 获取ip地址 - * - * @param request - * @return - */ - public static String getIp(HttpServletRequest request) { - String ipAddress = request.getHeader("x-forwarded-for"); - String unknown = "unknown"; - if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { - ipAddress = request.getHeader("Proxy-Client-IP"); - } - if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { - ipAddress = request.getHeader("WL-Proxy-Client-IP"); - } - if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { - ipAddress = request.getRemoteAddr(); - String benji = "127.0.0.1"; - String bj = "0:0:0:0:0:0:0:1"; - if (benji.equals(ipAddress) || bj.equals(ipAddress)) { - ///根据网卡取本机配置的IP - InetAddress inet = null; - try { - inet = InetAddress.getLocalHost(); - } catch (UnknownHostException e) { - logger.error("UnknownHostException", e); - } - if (inet != null) { - ipAddress = inet.getHostAddress(); - } - } - } - ///对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 - int i = 15; - String s = ","; - if (ipAddress != null && ipAddress.length() > i) { - if (ipAddress.indexOf(s) > 0) { - ipAddress = ipAddress.substring(0, ipAddress.indexOf(",")); - } - } - return ipAddress; - } - - /** - * 获取设备信息 - * - * @param request - * @return - */ - public static String getDevice(HttpServletRequest request) { - return request.getHeader("User-Agent"); - } - - /** - * 获取来自终端的信息 - * - * @param context - * @param request - * @return - */ - public static void getFromTerminal(LoggerContext context, HttpServletRequest request) { - String fromTerminal = context.getFromTerminal(); - if (StringUtils.isEmpty(fromTerminal)) { - String device = getDevice(request); - String setFT = ""; - if (StringUtils.isNotEmpty(device)) { - context.setFromTerminal(getFromTerminal(device)); - } - } - } - - - private static String getTraceId(HttpServletRequest request) { - String traceId = request.getHeader("traceId"); - if (StringUtils.isNotBlank(traceId)) { - //System.out.println("traceId:====="+traceId); - return traceId; - } - return ""; - } - - /** - * @param request - * @return localhost:9080/api/fs/demo/updateReport - */ - public static String getRequestUrl(HttpServletRequest request) { - if (Objects.isNull(request) || Objects.isNull(request.getRequestURL())) { - return null; - } - return request.getRequestURL().toString(); - } - - /** - * @param request - * @return /api/fs/demo/updateReport - */ - public static String getRequestUri(HttpServletRequest request) { - return request.getRequestURI(); - } - - /** - * @param request - * @return GET/POST - */ - public static String getRequestMethod(HttpServletRequest request) { - return request.getMethod(); - } - - -// /** -// * 获取当前方法中的日志实体类 -// * @return -// */ -// public static LoggerContext currentElogContext() { -// return ElogThreadLocal.currentLoggerContext(); -// } - - - public static int getIntValue(String v) { - return getIntValue(v, -1); - } - - public static int getIntValue(String v, int def) { - try { - return Integer.parseInt(v); - } catch (Exception var3) { - return def; - } - } - - public static long getLongValue(String v) { - return getLongValue(v, -1l); - } - - public static long getLongValue(String v, long def) { - try { - return Long.parseLong(v); - } catch (Exception var3) { - return def; - } - } - - public static boolean isLongValue(String v) { - try { - Long.parseLong(v); - } catch (Exception e) { - return false; - } - return true; - } - - - -// /** -// * 获取request请求 -// * -// * @return -// */ -// public static HttpServletRequest getRequest() { -// return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); -// } - - /** - * 将对象转换程字符串 - * - * @param obj 目标对象 - * @param def 如果为null时的默认值 - * @return - */ - public static String null2String(Object obj, String def) { - return obj == null ? def : obj.toString(); - } - - public static String null2String(Object obj) { - return null2String(obj, ""); - } - - public static int getIntValue(Object obj, int def) { - try { - return Integer.parseInt(null2String(obj)); - } catch (Exception ex) { - return def; - } - } - -// public static Page getPage() { -// HttpServletRequest request = getRequest(); -// String num = request.getParameter("pageNum"); -// String size = request.getParameter("pageSize"); -// -// Page page = new Page(ElogSeviceUtils.getIntValue(num, 1), ElogSeviceUtils.getIntValue(size, 10)); -// return page; -// } - -// public static void main(String[] args) { -// //System.out.println(getTableName("select", "from")); -// //DataTypeEnum columnTypeEnum = getEnumFromString(DataTypeEnum.class, "varchar"); -// } - - public static List switchString(List list) { - if (list != null) { - return list.stream().map(m -> { - Set en = m.entrySet(); - for (Map.Entry entry : en) { - if (entry.getValue() != null) { - entry.setValue(String.valueOf(entry.getValue())); - } - } - return m; - }).collect(Collectors.toList()); - } else { - return list; - } - } - - public static List switchComplexString(List list) { - if (list != null) { - return list.stream().map(m -> { - Iterator iterator = m.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry next = iterator.next(); - if (next.getValue() != null) { - if (next.getValue() instanceof Map && "parmas".equals(next.getKey())) { - next.setValue(String.valueOf(next.getValue())); - } - if (next.getValue() instanceof List) { - } else { - next.setValue(String.valueOf(next.getValue())); - } - } - } - return m; - }).collect(Collectors.toList()); - } else { - return list; - } - } - - public static String getTenantKey() { - return SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; - } - - public static String getEmployeeId() { - return ""; - } - -// public static String getUserName() { -// -// String employeeId = getEmployeeId(); -// if (StringUtils.isNotEmpty(employeeId)) { -// SimpleEmployee simpleEmployee = null; -// try { -// HrmCommonUtil hrmCommonUtil = (HrmCommonUtil) ApplicationContextProvider.getBean("hrmCommonUtil"); -// simpleEmployee = hrmCommonUtil.getSimpleEmployee(ElogSeviceUtils.getLongValue(employeeId)); -// } catch (Exception e) { -// logger.error("Exception", e); -// } -// if (simpleEmployee != null) { -// if (StringUtils.isNotBlank(simpleEmployee.getUsername())) { -// return simpleEmployee.getUsername(); -// } -// } -// } -// -// -// return ""; -// } - -// /** -// * 获取rpc信息（客户端ip和来源设备） -// * -// * @param context -// */ -// public static void initRpcInfo(LoggerContext context) { -// String device = ""; -// String clientIp = ""; -// String traceId = ""; -// try { -// device = RpcContext.getContext().getAttachment(EteamsConstant.DEVICE); -// clientIp = RpcContext.getContext().getAttachment(EteamsConstant.CLIENT_IP); -// traceId = RpcContext.getContext().getAttachment(ApmConstant.TRACE_ID); -// logger.info("rpc调用获取到 device:{},clientIp:{},traceId:{}", device, clientIp, traceId); -// } catch (Exception e) { -// logger.error("Exception", e); -// } -// if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { -// context.setDevice(device); -// } -// if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { -// context.setFromTerminal(getFromTerminal(device)); -// } -// -// if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { -// context.setClientIp(clientIp); -// } -// if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { -// context.setBelongMainId(traceId); -// } -// } - - public static String getFromTerminal(String device) { - String setFT = ""; - if (StringUtils.isNotEmpty(device)) { - if (!device.contains("wxwork") && device.contains("MicroMessenger")) {//来自微信 - setFT = FromTerminalType.MICO_MSG.getCode(); - } else if (device.contains("wxwork") && device.contains("MicroMessenger")) {//企业微信 - setFT = FromTerminalType.WECHAT.getCode(); - } else if (device.contains("iPhone") && device.contains("Mac")) {//来自 Iphone - setFT = FromTerminalType.IOS.getCode(); - } else if (device.contains("Mac OS") && !device.contains("iPhone") && device.contains("weapp-pc")) {//来自 mac_client - setFT = FromTerminalType.MAC_CLIENT.getCode();//mac_client - } else if (!device.contains("wxwork") && device.contains("Mobile")) {//移动端 - setFT = FromTerminalType.H5.getCode(); - } else if (device.contains("Android") && !device.contains("wxwork")) {//来自安卓 包含安卓并且不包含微信 - setFT = FromTerminalType.ANDROID.getCode(); - } else {//pc - setFT = FromTerminalType.PC.getCode(); - } - } - return setFT; - } - - /** - * sql连接条件注入sql - * - * @param condition - * @return - */ - public static String checkConditionSql(String condition) { - if ("AND".equalsIgnoreCase(condition) || - "OR".equalsIgnoreCase(condition) - ) { - return condition; - } - return "AND"; - } - - public static String checkTypeSql(String type) { - if ("LIKE".equalsIgnoreCase(type) || - "IN".equalsIgnoreCase(type) || - "!<>".equalsIgnoreCase(type) || - "!=".equalsIgnoreCase(type) || - "BETWEEN".equalsIgnoreCase(type) || - "IS NULL".equalsIgnoreCase(type) || - "IS NULL".equalsIgnoreCase(type) || - "=".equalsIgnoreCase(type) || - "IS NOT NULL".equalsIgnoreCase(type)) { - return type; - } - return "="; - } - - /** - * sql条件防止注入 - * - * @param value - * @return - */ - public static String checkValSql(String value) { - if (StringUtils.isBlank(value)) { - return ""; - } - Pattern p = Pattern.compile("\\s+"); - Matcher m = p.matcher(value); - String val = m.replaceAll(" "); - String[] keywords = {"master ", "truncate ", "declare ", "alert ", "create ", "drop ", " version", - "show ", "table ", "index ", "insert ", "into ", "from ", - "select ", "delete ", "update ", "mid ", "master ", "char ","union "}; - - String replaceStr = val.replaceAll(" ", ""); - if (replaceStr.contains("1=1") || replaceStr.contains(";")) { - return "-1"; - } - int count = 0; - String filterVal = ""; - for (String keyddlword : keywords) { - if (val.toLowerCase().contains(keyddlword)) { - count++; - if (count == 1) { - filterVal = keyddlword; - } - } - } - - if (count > 2) { - return filterVal; - } -// value = SecurityUtil.ecodeForSql(value); - - return value; - } - - /** - * 压缩工具类- - * - * @param str - * @return desc:version 0.0.1 基于jdk自带 GZIP 压缩。最后转成base64。 - * 市面上有其他压缩像jdk 的 deflate 可以设置压缩级别，但是都是主动的，需要改业务方法， - * snappy 压缩适用于大数据压缩。大数据量比较快 hadoop首选，但是压缩后比例比较大。 - * xz 下的 压缩比率大，但是解压比较慢-不提倡，空间换时间了 - * common下的压缩其实和jdk差不多，网上说优于jdk，但是相差不大。 - * weaver 压缩基于jdk - */ - public static String compress(String str) { - if (str == null || str.trim().length() == 0) { - return str; - } - try (ByteArrayOutputStream out = new ByteArrayOutputStream(); - GZIPOutputStream gzip = new GZIPOutputStream(out)) { - gzip.write(str.getBytes()); - gzip.close(); - return Base64.getEncoder().encodeToString(out.toByteArray()); - } catch (Exception e) { - logger.error("压缩失败", e.getMessage()); - return str; - } - - } - - - /** - * 解压缩 - * - * @param str - * @return - */ - public static String uncompress(String str) { - byte[] decode = Base64.getDecoder().decode(str); - if (str == null || str.trim().length() == 0) { - return str; - } - try (ByteArrayOutputStream out = new ByteArrayOutputStream(); - ByteArrayInputStream in = new ByteArrayInputStream(decode)) { - GZIPInputStream ungzip = new GZIPInputStream(in); - byte[] buffer = new byte[2048]; - int n; - while ((n = ungzip.read(buffer)) >= 0) { - out.write(buffer, 0, n); - } - return new String(out.toByteArray()); - } catch (Exception e) { - logger.error("解缩失败：{}", e.getMessage()); - return str; - } - } - - public static Boolean checkIsNumber(Object obj) { - if (obj == null) { - return false; - } - - return StringUtils.isNumeric(obj.toString()); - - } -} diff --git a/src/com/engine/salary/elog/util/ElogUtils.java b/src/com/engine/salary/elog/util/ElogUtils.java deleted file mode 100644 index 38edd827d..000000000 --- a/src/com/engine/salary/elog/util/ElogUtils.java +++ /dev/null @@ -1,713 +0,0 @@ -package com.engine.salary.elog.util; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.enums.FromTerminalType; -import com.engine.salary.elog.threadlocal.ElogThreadLocal; -import org.apache.commons.lang3.StringUtils; -import org.apache.dubbo.common.utils.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import weaver.hrm.User; - -import javax.servlet.http.HttpServletRequest; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -/** - * @ClassName: ElogUtils - * @Description TODO - * @Author tanghj - * @Date 2021/3/12 14:17 - */ -@Component -public class ElogUtils { - - private static final Logger logger = LoggerFactory.getLogger(ElogUtils.class); - - - - private static final String TABLE_SPACER = "_"; - private static final String TABLE_SUFFIX = "logs"; - private static final String DETAIL_TABLE_SUFFIX = "_detail"; - public static final String BASE_TABLE = "BASE_ELOG_TABLE"; - - public String getApplicationName() { - return applicationName; - } - - public void setApplicationName(String applicationName) { - this.applicationName = applicationName; - } - -// @Value("${spring.application.name}") - public static String applicationName; - - - - public static String getTableName(String module, String function) { - return getTableName(module, function, false); - } - - public static String getTableName(String module, String function, boolean isDetail) { - String tablename = module + TABLE_SPACER + function + TABLE_SUFFIX + (isDetail ? DETAIL_TABLE_SUFFIX : ""); -// SecurityUtil.sqlCheck(tablename); - return tablename; - } - - /** - * String 转枚举 - * - * @param c - * @param string - * @param - * @return - */ - public static > T getEnumFromString(Class c, String string) { - if (c != null && string != null) { - try { - return Enum.valueOf(c, string.trim().toUpperCase()); - } catch (IllegalArgumentException ex) { - } - } - return null; - } - - /** - * 获取ip地址 - * - * @param request - * @return - */ - public static String getIp(HttpServletRequest request) { - String ipAddress = request.getHeader("x-forwarded-for"); - String unknown = "unknown"; - if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { - ipAddress = request.getHeader("Proxy-Client-IP"); - } - if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { - ipAddress = request.getHeader("WL-Proxy-Client-IP"); - } - if (ipAddress == null || ipAddress.length() == 0 || unknown.equalsIgnoreCase(ipAddress)) { - ipAddress = request.getRemoteAddr(); - String benji = "127.0.0.1"; - String bj = "0:0:0:0:0:0:0:1"; - if (benji.equals(ipAddress) || bj.equals(ipAddress)) { - ///根据网卡取本机配置的IP - InetAddress inet = null; - try { - inet = InetAddress.getLocalHost(); - } catch (UnknownHostException e) { - logger.error("UnknownHostException", e); - } - if (inet != null) { - ipAddress = inet.getHostAddress(); - } - } - } - ///对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 - int i = 15; - String s = ","; - if (ipAddress != null && ipAddress.length() > i) { - if (ipAddress.indexOf(s) > 0) { - ipAddress = ipAddress.substring(0, ipAddress.indexOf(",")); - } - } - return ipAddress; - } - - /** - * 获取设备信息 - * - * @param request - * @return - */ - public static String getDevice(HttpServletRequest request) { - return request.getHeader("User-Agent"); - } - - /** - * 获取来自终端的信息 - * - * @param context - * @param request - * @return - */ - public static void getFromTerminal(LoggerContext context, HttpServletRequest request) { - String fromTerminal = context.getFromTerminal(); - if (StringUtils.isEmpty(fromTerminal)) { - String device = getDevice(request); - String setFT = ""; - if (StringUtils.isNotEmpty(device)) { - context.setFromTerminal(getFromTerminal(device)); - } - } - } - - public static void initRequestInfo(HttpServletRequest request, LoggerContext context) { - if (StringUtils.isEmpty(context.getRequestUrl())) { - context.setRequestUrl(getRequestUrl(request)); - } - if (StringUtils.isEmpty(context.getRequestUri())) { - context.setRequestUri(getRequestMethod(request) + ":" + getRequestUri(request)); - } - //if (context.getParams() == null) { - //默认记录params，此参数给true时 或报表服务，不记录 - if (!context.getParamsIgnore() && !applicationName.equalsIgnoreCase("weaver-edcreportd-service")) { - context.setParams(getRequstParam(request,context)); - } - // } - if (StringUtils.isEmpty(context.getClientIp())) { - context.setClientIp(getIp(request)); - } - if (StringUtils.isEmpty(context.getDevice())) { - context.setDevice(getDevice(request)); - } - if (StringUtils.isEmpty(context.getFromTerminal())) { - context.setFromTerminal(getFromTerminal(getDevice(request))); - } - if (StringUtils.isEmpty(context.getBelongMainId())) { - context.setBelongMainId(getTraceId(request)); - } - - } - - private static String getTraceId(HttpServletRequest request) { - String traceId = request.getHeader("traceId"); - if (StringUtils.isNotBlank(traceId)) { - //System.out.println("traceId:====="+traceId); - return traceId; - } - return ""; - } - - /** - * @param request - * @return localhost:9080/api/fs/demo/updateReport - */ - public static String getRequestUrl(HttpServletRequest request) { - if (Objects.isNull(request) || Objects.isNull(request.getRequestURL())) { - return null; - } - return request.getRequestURL().toString(); - } - - /** - * @param request - * @return /api/fs/demo/updateReport - */ - public static String getRequestUri(HttpServletRequest request) { - return request.getRequestURI(); - } - - /** - * @param request - * @return GET/POST - */ - public static String getRequestMethod(HttpServletRequest request) { - return request.getMethod(); - } - - public static Map getRequstParam(HttpServletRequest request, LoggerContext context) { - return request2Map(request, context); - } - - /** - * 获取当前方法中的日志实体类 - * - * @return - */ - public static LoggerContext currentElogContext() { - return ElogThreadLocal.currentLoggerContext(); - } - - public static Map request2Map(HttpServletRequest request, LoggerContext context) { - // 参数Map - Map properties = request.getParameterMap(); - // 返回值Map - Map returnMap = new HashMap(); - Iterator entries = properties.entrySet().iterator(); - Map.Entry entry; - String name = ""; - Object value = null; - while (entries.hasNext()) { - entry = (Map.Entry) entries.next(); - name = (String) entry.getKey(); - Object valueObj = entry.getValue(); - if (null == valueObj) { - value = null; - } else if (valueObj instanceof String[]) { - String[] values = (String[]) valueObj; - if (values.length == 1) { - value = values[0]; - } else { - value = values; - } - } else { - value = valueObj.toString(); - } - returnMap.put(name, value); - } - //放入ip - returnMap.put("param_ip", getIp(request)); - returnMap.put("request_header_user_agent", request.getHeader("user-agent")); - JSONObject body = ElogThreadLocal.getRequestBody(); - if (body != null) { -// returnMap.put("request_body", body); - setReturnMapBody(returnMap,context.getParamsBodyKeys(),body); - } - return returnMap; - } - - public static void setReturnMapBody(Map returnMap,List keys,JSONObject body) { - //模块没设置则全部记录 - if (CollectionUtils.isEmpty(keys)) { - returnMap.put("request_body", body); - }else { - JSONObject newBody = new JSONObject(); - for (String key : keys) { - newBody.put(key,body.get(key)); - } - returnMap.put("request_body", newBody); - } - } - - public static int getIntValue(String v) { - return getIntValue(v, -1); - } - - public static int getIntValue(String v, int def) { - try { - return Integer.parseInt(v); - } catch (Exception var3) { - return def; - } - } - - public static long getLongValue(String v) { - return getLongValue(v, -1l); - } - - public static long getLongValue(String v, long def) { - try { - return Long.parseLong(v); - } catch (Exception var3) { - return def; - } - } - - - /** - * 将对象转换程字符串 - * - * @param obj 目标对象 - * @param def 如果为null时的默认值 - * @return - */ - public static String null2String(Object obj, String def) { - return obj == null ? def : obj.toString(); - } - - public static String null2String(Object obj) { - return null2String(obj, ""); - } - - public static int getIntValue(Object obj, int def) { - try { - return Integer.parseInt(null2String(obj)); - } catch (Exception ex) { - return def; - } - } - -// public static Page getPage() { -// HttpServletRequest request = getRequest(); -// String num = request.getParameter("pageNum"); -// String size = request.getParameter("pageSize"); -// -// Page page = new Page(ElogUtils.getIntValue(num, 1), ElogUtils.getIntValue(size, 10)); -// return page; -// } - -// public static void main(String[] args) { -// //System.out.println(getTableName("select", "from")); -// //DataTypeEnum columnTypeEnum = getEnumFromString(DataTypeEnum.class, "varchar"); -// } - - public static List switchString(List list) { - if (list != null) { - return list.stream().map(m -> { - Set en = m.entrySet(); - for (Map.Entry entry : en) { - if (entry.getValue() != null) { - entry.setValue(String.valueOf(entry.getValue())); - } - } - return m; - }).collect(Collectors.toList()); - } else { - return list; - } - } - - public static List switchComplexString(List list) { - if (list != null) { - return list.stream().map(m -> { - Iterator iterator = m.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry next = iterator.next(); - if (next.getValue() != null) { - if (next.getValue() instanceof Map && "parmas".equals(next.getKey())) { - next.setValue(String.valueOf(next.getValue())); - } - if (next.getValue() instanceof List) { - } else { - next.setValue(String.valueOf(next.getValue())); - } - } - } - return m; - }).collect(Collectors.toList()); - } else { - return list; - } - } - - /** - * 获取rpc信息（客户端ip和来源设备） - * - * @param context - */ - public static void initRpcInfo(LoggerContext context) { - User user = context.getUser(); - if(user == null){ - return; - } - String device = user.getLogintype(); - String clientIp = user.getLoginip(); - String traceId = ""; - if (StringUtils.isEmpty(context.getDevice()) && StringUtils.isNotEmpty(device)) { - context.setDevice(device); - } - if (StringUtils.isEmpty(context.getFromTerminal()) && StringUtils.isNotEmpty(device)) { - context.setFromTerminal(getFromTerminal(device)); - } - - if (StringUtils.isEmpty(context.getClientIp()) && StringUtils.isNotEmpty(clientIp)) { - context.setClientIp(clientIp); - } - if (StringUtils.isEmpty(context.getBelongMainId()) && StringUtils.isNotEmpty(traceId)) { - context.setBelongMainId(traceId); - } - } - - public static String getFromTerminal(String device) { - String setFT = ""; - if (StringUtils.isNotEmpty(device)) { - if (!device.contains("wxwork") && device.contains("MicroMessenger")) {//来自微信 - setFT = FromTerminalType.MICO_MSG.getCode(); - } else if (device.contains("wxwork") && device.contains("MicroMessenger")) {//企业微信 - setFT = FromTerminalType.WECHAT.getCode(); - } else if (device.contains("iPhone") && device.contains("Mac")) {//来自 Iphone - setFT = FromTerminalType.IOS.getCode(); - } else if (device.contains("Mac OS") && !device.contains("iPhone") && device.contains("weapp-pc")) {//来自 mac_client - setFT = FromTerminalType.MAC_CLIENT.getCode();//mac_client - } else if (!device.contains("wxwork") && device.contains("Mobile")) {//移动端 - setFT = FromTerminalType.H5.getCode(); - } else if (device.contains("Android") && !device.contains("wxwork")) {//来自安卓 包含安卓并且不包含微信 - setFT = FromTerminalType.ANDROID.getCode(); - } else {//pc - setFT = FromTerminalType.PC.getCode(); - } - } - return setFT; - } - - /** - * sql连接条件注入sql - * - * @param condition - * @return - */ - public static String checkConditionSql(String condition) { - if ("AND".equalsIgnoreCase(condition) || - "OR".equalsIgnoreCase(condition) - ) { - return condition; - } - return "AND"; - } - - public static String checkTypeSql(String type) { - if ("LIKE".equalsIgnoreCase(type) || - "IN".equalsIgnoreCase(type) || - "!<>".equalsIgnoreCase(type) || - "!=".equalsIgnoreCase(type) || - "BETWEEN".equalsIgnoreCase(type) || - "IS NULL".equalsIgnoreCase(type) || - "IS NULL".equalsIgnoreCase(type) || - "=".equalsIgnoreCase(type) || - "IS NOT NULL".equalsIgnoreCase(type)) { - return type; - } - return "="; - } - - /** - * sql条件防止注入 - * - * @param value - * @return - */ - public static String checkValSql(String value) { - Pattern p = Pattern.compile("\\s+"); - Matcher m = p.matcher(value); - String val = m.replaceAll(" "); - String[] keywords = {"master", "truncate", "declare", "alert", "create", "drop", "version", - "show", "table", "index", "insert", "into", "from", - "insert", "select", "delete", "update", "chr", "mid", "master", "truncate", "char", "declare", "union"}; - - - int count = 0; - String filterVal = ""; - for (String keyddlword : keywords) { - if (val.toLowerCase().contains(keyddlword)) { - count++; - if (count == 1) { - filterVal = keyddlword; - } - } - } - - if (count > 2) { - return filterVal; - } -// value = SecurityUtil.ecodeForSql(value); - - return value; - } - - /** - * 压缩工具类- - * - * @param str - * @return desc:version 0.0.1 基于jdk自带 GZIP 压缩。最后转成base64。 - * 市面上有其他压缩像jdk 的 deflate 可以设置压缩级别，但是都是主动的，需要改业务方法， - * snappy 压缩适用于大数据压缩。大数据量比较快 hadoop首选，但是压缩后比例比较大。 - * xz 下的 压缩比率大，但是解压比较慢-不提倡，空间换时间了 - * common下的压缩其实和jdk差不多，网上说优于jdk，但是相差不大。 - * weaver 压缩基于jdk - */ - public static String compress(String str) { - if (str == null || str.trim().length() == 0) { - return str; - } - try (ByteArrayOutputStream out = new ByteArrayOutputStream(); - GZIPOutputStream gzip = new GZIPOutputStream(out)) { - gzip.write(str.getBytes()); - gzip.close(); - return Base64.getEncoder().encodeToString(out.toByteArray()); - } catch (Exception e) { - logger.error("压缩失败", e.getMessage()); - return str; - } - - } - - - /** - * 解压缩 - * - * @param str - * @return - */ - public static String uncompress(String str) { - byte[] decode = Base64.getDecoder().decode(str); - if (str == null || str.trim().length() == 0) { - return str; - } - try (ByteArrayOutputStream out = new ByteArrayOutputStream(); - ByteArrayInputStream in = new ByteArrayInputStream(decode)) { - GZIPInputStream ungzip = new GZIPInputStream(in); - byte[] buffer = new byte[2048]; - int n; - while ((n = ungzip.read(buffer)) >= 0) { - out.write(buffer, 0, n); - } - return new String(out.toByteArray()); - } catch (Exception e) { - logger.error("解缩失败：{}", e.getMessage()); - return str; - } - } - - public static LoggerContext getEsField(LoggerContext context, String field) { - - switch (field.toLowerCase()) { - case "interfacename": - context.setInterfaceName(""); - break; - case "operatetype": - context.setOperateType(""); - break; - case "operatedesc": - context.setOperatedesc(""); - break; - case "params": - context.setParamsStr("ES"); - break; - case "clientip": - context.setClientIp(""); - break; - case "groupnamelabel": - context.setGroupNameLabel(""); - break; - case "redoservice": - context.setRedoService(""); - break; - case "redocontext": - context.setRedoContextStr(""); - break; - case "cancelservice": - context.setCancelService(""); - break; - case "cancelcontext": - context.setCancelContextStr(""); - break; - case "device": - context.setDevice(""); - break; - case "groupid": - context.setGroupId(""); - break; - case "belongmainid": - context.setBelongMainId(""); - break; - case "requesturl": - context.setRequestUrl(""); - break; - case "requesturi": - context.setRequestUri(""); - break; - case "log_result": - context.setResult(""); - break; - case "fromterminal": - context.setFromTerminal(""); - break; - case "resultdesc": - context.setResultDesc(""); - break; - case "old_content": - context.setOld_content(""); - break; - case "link_type": - context.setLink_type(""); - break; - } - - return context; - } - - public static String[] getESfields(String value) { - String[] split = value.split(","); - List list = new ArrayList<>(); - for (String s : split) { - switch (s.toLowerCase()) { - case "interfacename": - list.add("interfacename"); - break; - case "operatetype": - list.add("operatetype"); - break; - case "operatedesc": - list.add("operatedesc"); - break; - case "params": - list.add("params"); - break; - case "clientip": - list.add("clientip"); - break; - case "groupnamelabel": - list.add("groupnamelabel"); - break; - case "redoservice": - list.add("redoservice"); - break; - case "redocontext": - list.add("redocontext"); - break; - case "cancelservice": - list.add("cancelservice"); - break; - case "cancelcontext": - list.add("cancelcontext"); - break; - case "device": - list.add("device"); - break; - case "groupid": - list.add("groupid"); - break; - case "belongmainid": - list.add("belongmainid"); - break; - case "requesturl": - list.add("requesturl"); - break; - case "requesturi": - list.add("requesturi"); - break; - case "log_result": - list.add("logResult"); - break; - case "fromterminal": - list.add("fromterminal"); - break; - case "resultdesc": - list.add("resultdesc"); - break; - case "old_content": - list.add("oldContent"); - break; - case "link_type": - list.add("linkType"); - break; - } - } - //list转为数组 - if (list.size() > 0) { - String[] strings = list.toArray(new String[list.size()]); - return strings; - } - return null; - } - - public static String handleClobColumn(String value) { - // 处理超长字符串，oracle插入报错ORA-01704: string literal too long - if (StringUtils.isBlank(value)){ - return ""; - } - StringBuilder formatValue = new StringBuilder(); - String[] split = StrUtil.split(value, 1000); - for (int i = 0; i < split.length; i++) { - formatValue.append("TO_CLOB('").append(split[i]).append("')"); - if (i != split.length - 1) { - formatValue.append("||"); - } - } - return formatValue.toString(); - } - -} diff --git a/src/com/engine/salary/elog/util/FieldNameMap.java b/src/com/engine/salary/elog/util/FieldNameMap.java deleted file mode 100644 index dcde0258c..000000000 --- a/src/com/engine/salary/elog/util/FieldNameMap.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.engine.salary.elog.util; - -import org.apache.commons.lang3.StringUtils; - -import java.util.HashMap; -import java.util.Map; - -/** - * @ClassName: FieldNameMap - * @Description TODO - * @Author tanghj - * @Date 2021/3/31 14:27 - */ -public class FieldNameMap { - - private static Map mainFieldNameMap = new HashMap<>(); - - private static Map detailFieldNameMap = new HashMap<>(); - - private static Map> mainCusFieldNameMap = new HashMap<>(); - - private static Map> detailCusFieldNameMap = new HashMap<>(); - - - public static void setMainFieldName(Map fieldNameMap) { - mainFieldNameMap.putAll(fieldNameMap); - } - - public static void setDetailFieldName(Map fieldNameMap) { - detailFieldNameMap.putAll(fieldNameMap); - } - - public static void setMainCusFieldName(String module, String function, Map fieldNameMap) { - mainCusFieldNameMap.put(getKey(module, function), fieldNameMap); - } - - public static void setDetailCusFieldName(String module, String function, Map fieldNameMap) { - detailCusFieldNameMap.put(getKey(module, function), fieldNameMap); - } - - - public static String getMainFieldNameMap(String module, String function, String key) { - - String str = key.toLowerCase(); - if(mainFieldNameMap.containsKey(str)) { - return StringUtils.isNotEmpty(mainFieldNameMap.get(str)) ? mainFieldNameMap.get(str) : key; - } else { - return getMainCusFieldNameMap(module, function,key); - } - } - - public static String getDetailFieldNameMap(String module, String function, String key) { - key = key.toLowerCase(); - if(detailFieldNameMap.containsKey(key)) { - return StringUtils.isNotEmpty(detailFieldNameMap.get(key)) ? detailFieldNameMap.get(key) : key; - } else { - return getDetailCusFieldNameMap(module, function, key); - } - } - - public static String getMainCusFieldNameMap(String module, String function, String key) { - - if(mainCusFieldNameMap.containsKey(getKey(module, function))) { - if(mainCusFieldNameMap.get(getKey(module, function)).containsKey(key)) { - return StringUtils.isNotEmpty(mainCusFieldNameMap.get(getKey(module, function)).get(key)) ? - mainCusFieldNameMap.get(getKey(module, function)).get(key) : - key; - } else { - return key; - } - } else { - return key; - } - } - - public static String getDetailCusFieldNameMap(String module, String function, String key) { - - if(detailCusFieldNameMap.containsKey(getKey(module, function))) { - if(detailCusFieldNameMap.get(getKey(module, function)).containsKey(key)) { - return StringUtils.isNotEmpty(detailCusFieldNameMap.get(getKey(module, function)).get(key)) ? - detailCusFieldNameMap.get(getKey(module, function)).get(key) : - key; - } else { - return key; - } - } else { - return key; - } - } - - private static String getKey(String module, String function) { - return module + "@" + function; - } -} diff --git a/src/com/engine/salary/elog/util/LoggerTemplate.java b/src/com/engine/salary/elog/util/LoggerTemplate.java deleted file mode 100644 index 842f72783..000000000 --- a/src/com/engine/salary/elog/util/LoggerTemplate.java +++ /dev/null @@ -1,630 +0,0 @@ -package com.engine.salary.elog.util; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.parser.Feature; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.engine.salary.constant.SalaryDefaultTenantConstant; -import com.engine.salary.elog.annotation.ElogTransform; -import com.engine.salary.elog.async.LoggerMessageListener; -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.entity.dto.LoggerDetailContext; -import com.engine.salary.elog.entity.dto.TableChangeBean; -import com.engine.salary.util.db.IdGenerator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import weaver.hrm.User; - -import java.lang.reflect.Field; -import java.util.*; - -/** - * @ClassName: LoggerTemplate - * @Description 日志基本功能类 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -//@Component -public class LoggerTemplate { - protected String function = "common"; - - protected String module; - - protected String logCenterQueue = "Elog_cneterlogQueue"; - - public static final String AUDITLOGQUEUE = "AuditLog"; - public static final String ELOG = "Elog"; - - protected String localQueue; - - protected String moduleName; - - protected static String applicationName; - - public void setApplicationName(String applicationName) { - LoggerTemplate.applicationName = applicationName; - } - - public String getApplicationName() { - return applicationName; - } - - private static final Logger logger = LoggerFactory.getLogger(LoggerTemplate.class); - - protected static String publishkitGroup; - - public void setPublishkitGroup(String publishkitGroup) { - LoggerTemplate.publishkitGroup = publishkitGroup; - } - - public String getPublishkitGroup() { - return publishkitGroup; - } - - - LoggerMessageListener loggerMessageListener = new LoggerMessageListener(); - - /** - * 写入日志消息队列 - * - * @param context 日志实体 - */ - public void write(LoggerContext context) { - this.write(context, true); - } - - /** - * 写入日志消息队列 - * - * @param context 日志实体 - * @param isLocal true 存储本地， false不存储本地 - */ - public void write(LoggerContext context, boolean isLocal) { - String elogLocalQueue = ELOG + this.applicationName; - if (StringUtils.isEmpty(this.localQueue)) - this.localQueue = (StringUtils.isNotEmpty(this.moduleName) ? this.moduleName : elogLocalQueue) + "LocalQueue" + this.publishkitGroup; - try { - handleContext(context); - } catch (Exception e) { - logger.error("handleContext方法异常！{}", e.getMessage(), e); - } - loggerMessageListener.receiveold(context); - - } - -// public void writeLocal(LoggerContext context){ -// String elogLocalQueue = ELOG + this.applicationName; -// if(StringUtils.isEmpty(this.localQueue)) -// this.localQueue = (StringUtils.isNotEmpty(this.moduleName) ? this.moduleName : elogLocalQueue) + "LocalQueue" + this.publishkitGroup; -// AsyncBean asyncBean = new AsyncBean<>(); -// handleContext(context); -// if (context.getWeakElogReocrd() && CollectionUtils.isEmpty(context.getDetailContexts() )) { -// logger.info("日志弱控且没有明细记录，不记录日志,modulename:{},functionname:{}",context.getModuleName(),context.getFunctionName()); -// return; -// } -// -// try { -// asyncBean.setMessage(context); -// asyncBean.setQueue(localQueue); -// asyncClient.send(asyncBean); -// } catch (Exception e) { -// logger.error("发送writeLocal-mq消息异常！{}",e.getMessage(),e); -// } -// } - - -// public void checkAsyncBean(AsyncBean asyncBean) { -// int length = JSON.toJSON(asyncBean).toString().getBytes(StandardCharsets.UTF_8).length / 1000; -// boolean checkPass = length <= 5120; -// if (!checkPass) -// throw new RuntimeException("消息体超出5M，不支持发送!"); -// } - -// /** -// * 没有明细变化可以不写入日志 -// * @param context 日志信息 -// * @param isLocal 是否写入本地 -// * @param notChangeDetailSendLog 没有明细变化不写入日志 -// */ -// public void write(LoggerContext context, boolean isLocal,boolean notChangeDetailSendLog){ -// String elogLocalQueue = ELOG + this.applicationName; -// if(StringUtils.isEmpty(this.localQueue)) -// this.localQueue = (StringUtils.isNotEmpty(this.moduleName) ? this.moduleName : elogLocalQueue) + "LocalQueue"; -// AsyncBean asyncBean = new AsyncBean<>(); -// handleContext(context); -// -// if (notChangeDetailSendLog && (context.getDetailContexts() == null || context.getDetailContexts().size() == 0)) { -// return; -// } -// try { -// asyncBean.setMessage(context); -// asyncBean.setQueue(logCenterQueue); -// asyncClient.send(asyncBean); -// writeHrmLog(context); -// if(isLocal) { -// asyncBean.setQueue(localQueue); -// asyncClient.send(asyncBean); -// } -// } catch (Exception e) { -// logger.error("发送mq消息异常！{}",e.getMessage(),e); -// } -// -// } - -// /** -// * 支持了向其他模块服务发送业务日志 -// * @param context -// * @param isLocal -// * @param moduleName -// */ -// public void write(LoggerContext context, boolean isLocal, String moduleName){ -// -// if(StringUtils.isNotEmpty(moduleName)) { -// String localQueue = moduleName + "LocalQueue"; -// // context.setModuleName(moduleName); -// AsyncBean asyncBean = new AsyncBean<>(); -// handleContext(context); -// try { -// asyncBean.setMessage(context); -// asyncBean.setQueue(logCenterQueue); -// asyncClient.send(asyncBean); -// writeHrmLog(context); -// if(isLocal) { -// asyncBean.setQueue(localQueue); -// asyncClient.send(asyncBean); -// } -// } catch (Exception e) { -// logger.error("发送mq消息异常！:{}",e.getMessage()); -// } -// } else { -// write(context, isLocal); -// } -// -// } - -// public void writeHrmLog(LoggerContext context) { -// AsyncBean asyncBean = new AsyncBean<>(); -// handleContext(context); -// asyncBean.setMessage(context); -// //asyncBean.setTopic(WRITEAUDITLOGTOPIC); -// asyncBean.setQueue(AUDITLOGQUEUE); -// asyncClient.send(asyncBean); -// -// } - -// /** -// * 支持了向其他模块服务发送业务日志 -// * @param context -// * @param isLocal -// * @param moduleName -// */ -// public void write(LoggerContext context, boolean isLocal, String moduleName,String functionName,String queueName){ -// -// if (StringUtils.isNotEmpty(moduleName) && StringUtils.isNotEmpty(functionName)) { -// context.setModuleName(moduleName); -// context.setFunctionName(functionName); -// this.localQueue = queueName + "LocalQueue"; -// AsyncBean asyncBean = new AsyncBean<>(); -// handleContext(context); -// try { -// asyncBean.setMessage(context); -// asyncBean.setQueue(logCenterQueue); -// asyncClient.send(asyncBean); -// writeHrmLog(context); -// if (isLocal) { -// asyncBean.setQueue(localQueue); -// asyncClient.send(asyncBean); -// } -// } catch (Exception e) { -// logger.error("发送mq消息异常！,{}！",e); -// } -// } else { -// write(context, isLocal); -// } -// -// } - - private void handleContext(LoggerContext context) { - if (StringUtils.isEmpty(context.getModuleName())) - context.setModuleName(module); - if (StringUtils.isEmpty(context.getFunctionName())) - context.setFunctionName(function); - if (!(context.getId() > 0)) - context.setId(IdGenerator.generate()); - if (StringUtils.isEmpty(context.getUuid())) { - context.setUuid(UUID.randomUUID().toString().replace("-", "")); - } - - context.setTempParams(null); - String employeeId = Optional.ofNullable(context.getUser()).map(User::getUID).orElse(0).toString(); - String tenantKey = SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; - String userName = Optional.ofNullable(context.getUser()).map(User::getUsername).orElse("").toString(); - if (StringUtils.isEmpty(context.getOperator()) && StringUtils.isNotEmpty(employeeId)) { - context.setOperator(employeeId + ""); - } - if (StringUtils.isEmpty(context.getTenant_key()) && StringUtils.isNotEmpty(tenantKey)) { - context.setTenant_key(tenantKey); - } - if (StringUtils.isEmpty(context.getOperatorName()) && StringUtils.isNotEmpty(userName)) { - context.setOperatorName(userName); - } - //} - - if (StringUtils.isBlank(context.getOperator()) || "null".equals(context.getOperator())) { - context.setOperator("-1"); - } - if (StringUtils.isBlank(context.getTargetId()) || "null".equals(context.getTargetId())) { - context.setTargetId("-1"); - } - -// RequestAttributes requestAttributes = SalaryContext.get().getRequestAttributesSafely(); -// if ((requestAttributes instanceof ServletRequestAttributes)) { -// HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest(); -// ElogUtils.initRequestInfo(request, context); -// } else { -// if (StringUtils.isEmpty(context.getRequestUrl())) { -// context.setRequestUrl("非http请求"); -// } -// ElogUtils.initRpcInfo(context); -// } - ElogUtils.initRpcInfo(context); - - List changeBeans = context.getChangeValues(); - - List valueChangeList = new ArrayList<>(); - int showOrder = 0; - if (changeBeans != null) - for (TableChangeBean changeBean : changeBeans) { - if (changeBean != null && (changeBean.getNewValue() != null || changeBean.getOldValue() != null)) { - String uuid = UUID.randomUUID().toString().replace("-", ""); - ApiModel apiModel = null; - ElogTransform tableTransform = null; - JSONObject newJo = new JSONObject(); - JSONObject oldJo = new JSONObject(); - JSONObject valueChange = JSONObject.parseObject(JSONObject.toJSONString(changeBean, SerializerFeature.WriteDateUseDateFormat), Feature.OrderedField); - Field[] fields = null; - if (changeBean.getNewValue() != null) { - apiModel = changeBean.getNewValue().getClass().getAnnotation(ApiModel.class); - tableTransform = changeBean.getNewValue().getClass().getAnnotation(ElogTransform.class); - //fields = changeBean.getNewValue().getClass().getDeclaredFields(); - fields = getAllFields(changeBean.getNewValue().getClass()); - newJo = valueChange.getJSONObject("newValue"); - } else { - apiModel = changeBean.getOldValue().getClass().getAnnotation(ApiModel.class); - tableTransform = changeBean.getOldValue().getClass().getAnnotation(ElogTransform.class); - //fields = changeBean.getOldValue().getClass().getDeclaredFields(); - fields = getAllFields(changeBean.getOldValue().getClass()); - } - if (changeBean.getOldValue() != null) { - oldJo = valueChange.getJSONObject("oldValue"); - } - if ((apiModel != null || tableTransform != null) && fields != null) { - - for (Field field : fields) { - if (StringUtils.isEmpty(newJo.getString(field.getName())) && StringUtils.isEmpty(oldJo.getString(field.getName()))) { - continue; - } - if (StringUtils.isNotEmpty(newJo.getString(field.getName())) && newJo.getString(field.getName()).equals(oldJo.getString(field.getName()))) { - continue; - } - - ApiModelProperty apiModelProperty = field.getAnnotation(ApiModelProperty.class); - ElogTransform fieldElogTransform = field.getAnnotation(ElogTransform.class); - LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - if (fieldElogTransform != null && fieldElogTransform.ignore()) { - continue; - } - - //todo 若analyticList为true 且 新旧值属于JSONArray 解析List - if (fieldElogTransform != null && fieldElogTransform.analyticList() && fieldElogTransform.analyticListClass() != void.class) { - analyticListMethod(field, newJo, oldJo, valueChangeList, fieldElogTransform); - continue; - } - - valueChangeBean.setUuid(uuid); - valueChangeBean.setTableName(tableTransform != null && StringUtils.isNotEmpty(tableTransform.name()) ? tableTransform.name() : changeBean.getTableName()); - valueChangeBean.setTableNameDesc(tableTransform != null && StringUtils.isNotEmpty(tableTransform.tablename()) ? tableTransform.tablename() : ""); - valueChangeBean.setTableNameLabelId(tableTransform != null && tableTransform.labelId() != -1 ? tableTransform.labelId() + "" : ""); - valueChangeBean.setIsDetail(changeBean.getIsDetail()); - valueChangeBean.setFieldName(field.getName()); - valueChangeBean.setFieldDesc(fieldElogTransform != null ? fieldElogTransform.name() : apiModelProperty != null ? apiModelProperty.value() : field.getName()); - valueChangeBean.setFieldNameLabelId(fieldElogTransform != null ? fieldElogTransform.labelId() + "" : "-1"); - valueChangeBean.setDataid(StringUtils.isNotEmpty(changeBean.getDataid()) ? changeBean.getDataid() : - StringUtils.isNoneEmpty(newJo.getString("id")) ? newJo.getString("id") : oldJo.getString("id")); - valueChangeBean.setBelongDataid(StringUtils.isNotEmpty(changeBean.getBelongDataid()) ? changeBean.getBelongDataid() : ""); - - valueChangeBean.setNewValue(newJo.getString(field.getName())); - valueChangeBean.setOldValue(oldJo.getString(field.getName())); - valueChangeBean.setCreator(-1l); - try { - extracted(newJo, oldJo, field, fieldElogTransform, valueChangeBean); - } catch (Exception e) { - logger.error("转换出错:{}", e); - //System.out.println("转换出错：" + e.getMessage()); - } - - - valueChangeBean.setShoworder(showOrder++); - valueChangeList.add(valueChangeBean); - } - } else { - Set keys = new HashSet<>(); - for (String key : (Set) newJo.keySet()) { - keys.add(key); - if (newJo.getString(key).equals(oldJo.getString(key))) { - continue; - } - LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - valueChangeBean.setUuid(uuid); - valueChangeBean.setTableName(changeBean.getTableName()); - valueChangeBean.setIsDetail(changeBean.getIsDetail()); - valueChangeBean.setDataid(StringUtils.isNotEmpty(changeBean.getDataid()) ? changeBean.getDataid() : - StringUtils.isNoneEmpty(newJo.getString("id")) ? newJo.getString("id") : oldJo.getString("id")); - valueChangeBean.setBelongDataid(StringUtils.isNotEmpty(changeBean.getBelongDataid()) ? changeBean.getBelongDataid() : ""); - valueChangeBean.setFieldName(key); - valueChangeBean.setFieldDesc(key); - valueChangeBean.setNewValue(newJo.getString(key)); - valueChangeBean.setOldValue(oldJo.getString(key)); - valueChangeBean.setShoworder(showOrder++); - valueChangeBean.setCreator(-1l); - valueChangeList.add(valueChangeBean); - } - for (String key : (Set) oldJo.keySet()) { - if (keys.contains(key)) - continue; - keys.add(key); - if (oldJo.getString(key).equals(newJo.getString(key))) { - continue; - } - LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - valueChangeBean.setTableName(changeBean.getTableName()); - valueChangeBean.setIsDetail(changeBean.getIsDetail()); - valueChangeBean.setFieldName(key); - valueChangeBean.setFieldDesc(key); - valueChangeBean.setNewValue(newJo.getString(key)); - valueChangeBean.setOldValue(oldJo.getString(key)); - valueChangeBean.setShoworder(showOrder++); - valueChangeBean.setCreator(-1l); - valueChangeList.add(valueChangeBean); - } - } - } - } - - if (valueChangeList.size() > 0) - context.setDetailContexts(valueChangeList); - } - - - private void analyticListMethod(Field field, JSONObject newJo, JSONObject oldJo, List valueChangeList, ElogTransform tableTransform) { - JSONArray newValueArr = newJo.get(field.getName()) == null ? new JSONArray() : (JSONArray) newJo.get(field.getName()); - JSONArray oldvalueArr = oldJo.get(field.getName()) == null ? new JSONArray() : (JSONArray) oldJo.get(field.getName()); - Field[] allFields = getAllFields(tableTransform.analyticListClass()); - - - Boolean oldvalueIsNull = false; - Boolean newvalueIsNull = false; - - if (oldvalueArr.size() == 0) { - oldvalueIsNull = true; - } - if (newValueArr.size() == 0) { - newvalueIsNull = true; - } - if ((oldvalueIsNull && newvalueIsNull) || (!oldvalueIsNull && !newvalueIsNull && oldvalueArr.size() != newValueArr.size())) { - //如果新、旧没值或新旧值list数量对不上 直接返回 - return; - } - - JSONArray foreachArr = oldvalueIsNull ? newValueArr : oldvalueArr; - - //遍历list - for (int i = 0; i < foreachArr.size(); i++) { - //默认另一个list关系是一一对应的 - JSONObject oldValue = oldvalueIsNull ? new JSONObject() : (JSONObject) oldvalueArr.get(i); - JSONObject newValue = newvalueIsNull ? new JSONObject() : (JSONObject) newValueArr.get(i); - - //dataid uuid showOrder - long dataid = IdGenerator.generate(); - String uuid = UUID.randomUUID().toString().replace("-", ""); - int showOrder = 0; - - //遍历字段 - for (Field allField : allFields) { - if (StringUtils.isEmpty(newValue.getString(allField.getName())) && StringUtils.isEmpty(oldValue.getString(allField.getName()))) { - continue; - } - if (StringUtils.isNotEmpty(newValue.getString(allField.getName())) && newValue.getString(allField.getName()).equals(oldValue.getString(allField.getName()))) { - continue; - } - - ApiModelProperty apiModelProperty = allField.getAnnotation(ApiModelProperty.class); - ElogTransform fieldElogTransform = allField.getAnnotation(ElogTransform.class); - LoggerDetailContext valueChangeBean = new LoggerDetailContext(); - - valueChangeBean.setUuid(uuid); - valueChangeBean.setTableName(tableTransform != null && StringUtils.isNotEmpty(tableTransform.name()) ? tableTransform.name() : field.getName()); - valueChangeBean.setTableNameDesc(tableTransform != null && StringUtils.isNotEmpty(tableTransform.tablename()) ? tableTransform.tablename() : ""); - valueChangeBean.setTableNameLabelId(tableTransform != null && tableTransform.labelId() != -1 ? tableTransform.labelId() + "" : ""); - valueChangeBean.setIsDetail(1); - valueChangeBean.setFieldName(allField.getName()); - valueChangeBean.setNewValue(newValue.getString(allField.getName())); - valueChangeBean.setOldValue(oldValue.getString(allField.getName())); - valueChangeBean.setCreator(-1l); - valueChangeBean.setBelongDataid(""); - valueChangeBean.setDataid(String.valueOf(dataid)); - - if (fieldElogTransform != null) { - if (fieldElogTransform.ignore()) { - continue; - } - - valueChangeBean.setFieldDesc(fieldElogTransform != null ? fieldElogTransform.name() : apiModelProperty != null ? apiModelProperty.value() : field.getName()); - valueChangeBean.setFieldNameLabelId(fieldElogTransform != null ? fieldElogTransform.labelId() + "" : "-1"); - - try { - extracted(newValue, oldValue, allField, fieldElogTransform, valueChangeBean); - } catch (Exception e) { - logger.error("转换出错", e); - //System.out.println("转换出错：" + e.getMessage()); - } - - valueChangeBean.setShoworder(showOrder++); - } else { - valueChangeBean.setFieldDesc(allField.getName()); - valueChangeBean.setShoworder(showOrder++); - - } - valueChangeList.add(valueChangeBean); - } - } - } - - private void extracted(JSONObject newJo, JSONObject oldJo, Field field, ElogTransform fieldElogTransform, LoggerDetailContext valueChangeBean) { - JSONObject jo = null; - if (fieldElogTransform != null && StringUtils.isNotEmpty(fieldElogTransform.valuesKVPairs())) { - jo = JSONObject.parseObject(fieldElogTransform.valuesKVPairs()); - if (jo != null) { - valueChangeBean.setNewRealValue(jo.getString(newJo.getString(field.getName()))); - valueChangeBean.setOldRealValue(jo.getString(oldJo.getString(field.getName()))); - } - } - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - - public void setLocalQueue(String localQueue) { - this.localQueue = localQueue; - } - - public String getFunction() { - return function; - } - - public void setFunction(String function) { - this.function = function; - } - - public String getModule() { - return module; - } - - /** - * 获取日志实体类 - * - * @return - */ - public LoggerContext getContext() { - - LoggerContext loggerContext = new LoggerContext(); - loggerContext.setUuid(UUID.randomUUID().toString().replace("-", "")); - loggerContext.setModuleName(this.module); - loggerContext.setFunctionName(this.function); - - return loggerContext; - - } - - public void setModule(String module) { - this.module = module; - } - -// public void setAsyncClient(AsyncClient asyncClient) { -// this.asyncClient = asyncClient; -// } - - - public static Field[] getAllFields(Class obj) { - Class superclass = obj.getSuperclass(); - Field[] superField = null; - //获取父类 - if (superclass != Object.class) { - superField = superclass.getDeclaredFields(); - } - //获取当前类 - Field[] nowfield = obj.getDeclaredFields(); - return addFields(superField, nowfield); - } - - public static Field[] addFields(Field[] superFields, Field[] fields) { - - return ArrayUtils.addAll(superFields, fields); - - } - - public void write(List context, boolean isLocal) { - context.forEach(loggerContext -> { - this.write(loggerContext, isLocal); - }); - } - - - public void write(List context) { - context.forEach(loggerContext -> { - this.write(loggerContext); - }); - } - -// public void writeAsync(LoggerContext context, boolean isLocal){ -// String applicationNameBak = this.applicationName; -// String localQueueBak = this.localQueue; -// String moduleNameBak = this.moduleName; -// String pk = this.publishkitGroup; -// LocalRunnable localRunnable = new LocalRunnable() { -// @Override -// public void execute() { -// String localQueueBakBak = localQueueBak; -// String elogLocalQueue = ELOG + applicationNameBak; -// if(StringUtils.isEmpty(localQueueBakBak)) -// localQueueBakBak = (StringUtils.isNotEmpty(moduleNameBak) ? moduleNameBak : elogLocalQueue) + "LocalQueue" + pk; -// AsyncBean asyncBean = new AsyncBean<>(); -// handleContext(context); -// if (context.getWeakElogReocrd() && CollectionUtils.isEmpty(context.getDetailContexts() )) { -// logger.info("日志弱控且没有明细记录，不记录日志,modulename:{},functionname:{}",context.getModuleName(),context.getFunctionName()); -// return; -// } -// try { -// asyncBean.setMessage(context); -// asyncBean.setQueue(logCenterQueue); -// checkAsyncBean(asyncBean);//检查消息体大小 -// asyncClient.send(asyncBean); -// writeHrmLog(context); -// if(isLocal) { -// asyncBean.setQueue(localQueueBakBak); -// asyncClient.send(asyncBean); -// } -// } catch (Exception e) { -// logger.error("发送mq消息异常！{}",e.getMessage(),e); -// } -// } -// }; -// ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.OTHER, "LoggerTemplate_writeAsync", localRunnable); -// -// } -// -// /** -// * 回滚队列 -// * -// * @param context -// */ -// public void writeRollBack(LoggerContext context){ -// String elogRollBackQueue = ELOG + this.applicationName + "RollBackQueue" + this.publishkitGroup; -// AsyncBean asyncBean = new AsyncBean<>(); -// -// try { -// asyncBean.setMessage(context); -// asyncBean.setQueue(elogRollBackQueue); -// checkAsyncBean(asyncBean);//检查消息体大小 -// asyncClient.send(asyncBean); -// } catch (Exception e) { -// logger.error("发送mq消息异常！{}",e.getMessage(),e); -// } -// } - -} diff --git a/src/com/engine/salary/elog/util/LoggerTemplateBuilder.java b/src/com/engine/salary/elog/util/LoggerTemplateBuilder.java deleted file mode 100644 index 14ae29945..000000000 --- a/src/com/engine/salary/elog/util/LoggerTemplateBuilder.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.engine.salary.elog.util; - -/** - * @ClassName: LoggerTemplateBuilder - * @Description 日志基本类构造器 - * @Author tanghj - * @Date 2021/2/10 14:18 - */ -public class LoggerTemplateBuilder { - - public static LoggerTemplate build(String module){ - return build(module, "common"); - } - public static LoggerTemplate build(String module, String function){ - LoggerTemplate loggerTemplate = new LoggerTemplate(); - loggerTemplate.setFunction(function); - loggerTemplate.setModule(module); - - return loggerTemplate; - } -} diff --git a/src/com/engine/salary/elog/web/LoggerTableController.java b/src/com/engine/salary/elog/web/LoggerTableController.java deleted file mode 100644 index fe85d3045..000000000 --- a/src/com/engine/salary/elog/web/LoggerTableController.java +++ /dev/null @@ -1,200 +0,0 @@ -package com.engine.salary.elog.web; - -import com.engine.common.util.ServiceUtil; -import com.engine.salary.elog.entity.param.ELogGetLogParam; -import com.engine.salary.elog.entity.param.GetDetailChangesParam; -import com.engine.salary.elog.service.ILoggerTableService; -import com.engine.salary.elog.service.impl.LoggerTableService; -import com.engine.salary.util.ResponseResult; -import com.engine.salary.util.page.PageInfo; -import io.swagger.v3.oas.annotations.parameters.RequestBody; -import weaver.hrm.HrmUserVarify; -import weaver.hrm.User; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import java.util.List; -import java.util.Map; - -public class LoggerTableController { - - private ILoggerTableService getLoggerTableService(User user) { - return ServiceUtil.getService(LoggerTableService.class, user); - } - - /** - * 获取日志 - * - * @param request - * @param response - * @param data - * @return - */ - @POST - @Path("/getLogs") - @Produces(MediaType.APPLICATION_JSON) - public String getLogs(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String data) { - User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getLoggerTableService(user)::queryLogs, data); - } - - /** - * 获取日志（卡片） - * - * @param request - * @param response - * @param data - * @return - */ - @POST - @Path("/getCardLogs") - @Produces(MediaType.APPLICATION_JSON) - public String carddatas(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String data) { - User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>>(user).run(getLoggerTableService(user)::queryCardLogList, data); - } - - /** - * 获取单条操作记录的更新明细 - * @param request - * @param response - * @param param - * @return - */ - @POST - @Path("/getDetailChanges") - @Produces(MediaType.APPLICATION_JSON) - public String getDetailChanges(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GetDetailChangesParam param) { - User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getLoggerTableService(user)::getDetailChanges, param); - } -// @ApiOperation("获取单条操作记录的更新明细") -// @POST -// @Path("/getDetailChanges") -// @Produces(MediaType.APPLICATION_JSON) -// public String getDetailChanges(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody String data) { -// User user = HrmUserVarify.getUser(request, response); -// return new ResponseResult>>(user).run(getLoggerTableService(user)::getDetailChanges, data); -// } -// -// /** -// * 获取单条操作记录的更新明细(分页) -// * -// * @param module 服务（模块）名 -// * @param function 方法名 -// * @param mainid 主键id -// * @param detailTransMethod 转换方法 -// * @param current 页码 -// * @param pageSize 每页条数 -// * @return WeaTable -// */ -// @ApiOperation("获取单条操作记录的更新明细(分页)") -// @RequestMapping(path = "getDetailChangePages", method = {RequestMethod.GET, RequestMethod.POST}) -// @WeaPermission(publicPermission = true) -// public WeaResult getDetailChangePages(@PathVariable("module") @ApiParam("服务（模块）名") String module, -// @PathVariable("function") @ApiParam("方法名") String function, -// @RequestParam("mainid") @ApiParam("主键id") String mainid, -// @RequestParam("detailTransMethod") @ApiParam("转换方法") String detailTransMethod, -// @RequestParam("page") @ApiParam("页码") String current, -// @RequestParam("pageSize") @ApiParam("每页条数") String pageSize) { -// return WeaResult.success(getLoggerTableService(user).getDetailChangePages(module, function, mainid, detailTransMethod, current, pageSize)); -// } - - /** - * 获取日志列表 - * - * @param request - * @param response - * @param param - * @return - */ - @POST - @Path("/datas") - @Produces(MediaType.APPLICATION_JSON) - public String datas(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ELogGetLogParam param) { - User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getLoggerTableService(user)::queryLogList, param); - } - - -// @ApiOperation("获取日志总数") -// @RequestMapping(path = "counts", method = {RequestMethod.GET, RequestMethod.POST}) -// @WeaPermission(publicPermission = true) -// public WeaResult> counts(@PathVariable("module") @ApiParam("服务（模块）名") String module, -// @PathVariable("function") @ApiParam("方法名") String function) { -// return WeaResult.success(getLoggerTableService(user).countLog(module, function), "success"); -// } -// -// @ApiOperation("获取明细日志列表") -// @RequestMapping(path = "detaildatas", method = {RequestMethod.GET, RequestMethod.POST}) -// @WeaPermission(publicPermission = true) -// public WeaResult>> detaildatas(@PathVariable("module") @ApiParam("服务（模块）名") String module, -// @PathVariable("function") @ApiParam("方法名") String function, -// @Param("pageSize") @ApiParam("每页多少数据") String pageSize, -// @Param("current") @ApiParam("当前页") String current, -// @Param("mainId") @ApiParam("主表id") String mainId, -// @ApiParam("查询条件") String condition) { -// -// if ("datasecurity".equals(module) && "auditLog".equals(function)) { -// try { -// ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); -// if (tableService != null) { -// List> list = tableService.queryDetailLogList(module, function, current, pageSize, condition, mainId); -// return WeaResult.success(list); -// } -// } catch (Exception e) { -// -// } -// } -// List> list = getLoggerTableService(user).queryDetailLogList(module, function, current, pageSize, condition, mainId); -// return WeaResult.success(list); -// } -// -// @ApiOperation("获取日志总数") -// @RequestMapping(path = "detailcounts", method = {RequestMethod.GET, RequestMethod.POST}) -// @WeaPermission(publicPermission = true) -// public WeaResult> detailcounts(@PathVariable("module") @ApiParam("服务（模块）名") String module, -// @PathVariable("function") @ApiParam("方法名") String function, -// @Param("mainId") @ApiParam("主表id") String mainId) { -// return WeaResult.success(getLoggerTableService(user).countDestailLog(module, function, mainId), "success"); -// } -// -// @ApiOperation("根据traceId获取链路列表") -// @RequestMapping(path = "queryLogTraceInfo", method = {RequestMethod.GET, RequestMethod.POST}) -// @WeaPermission(publicPermission = true) -// public WeaResult queryLogTraceInfo(@PathVariable("module") @ApiParam("服务（模块）名") String module, -// @PathVariable("function") @ApiParam("方法名") String function, -// @Param("traceId") @ApiParam("traceId") String traceId, -// @Param("currentPage") @ApiParam("currentPage") Integer currentPage, -// @Param("pageSize") @ApiParam("pageSize") Integer pageSize, -// @Param("traceTransMethod") @ApiParam("traceTransMethod") String traceTransMethod -// ) { -// -// if ("datasecurity".equals(module) && "auditLog".equals(function)) { -// try { -// ILoggerTableService tableService = ApplicationContextProvider.getBean("auditLogService", ILoggerTableService.class); -// if (tableService != null) { -// return WeaResult.success(tableService.queryElogTraceInfo(traceId, module, function, currentPage, pageSize, traceTransMethod), "success"); -// } -// } catch (Exception e) { -// -// } -// } -// -// return WeaResult.success(getLoggerTableService(user).queryElogTraceInfo(traceId, module, function, currentPage, pageSize, traceTransMethod), "success"); -// } -// -// @ApiOperation("日志下载") -// @RequestMapping(path = "downloadLog", method = {RequestMethod.GET, RequestMethod.POST}) -// @WeaPermission(publicPermission = true) -// public WeaResult downloadLog(@RequestBody(required = false) @ApiParam("数据") String data) { -// -// BatchDocumentMessage message = getLoggerTableService(user).downloadLog(data); -// return WeaResult.success(message); -// } -} diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java deleted file mode 100644 index c5547e753..000000000 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.engine.salary.mapper.elog; - -import com.engine.salary.elog.entity.dto.TableColumnBean; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -public interface ElogTableCheckerMapper { - Long getVersion(@Param("mainTable") String mainTable); - - void recordVersion(@Param("id") long id, @Param("mainTable") String mainTable, @Param("version") long version); - - void createMainTable(@Param("mainTable") String mainTable); - - void createDetailTable(@Param("detailTable") String detailTable); - - List getTableStructure(@Param("tableName") String tableName); - - void createElogTable(@Param("createElogSql") String createElogSql); - - Map getTableIndex(@Param("tableName") String tableName, @Param("columnName") String columnName); - - Map getDataBase(); - - void createTableIndex(@Param("tableName") String tableName, @Param("columnName") String columnName, @Param("id") long id); - - List getAllExistTables(@Param("tableNames") Set tables); -} diff --git a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml b/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml deleted file mode 100644 index 3581e1039..000000000 --- a/src/com/engine/salary/mapper/elog/ElogTableCheckerMapper.xml +++ /dev/null @@ -1,451 +0,0 @@ - - - - - insert into hrsa_elog_version (id, maintable, version) values (#{id},#{mainTable},#{version}) - - - - create table ${mainTable} - ( - id bigint comment 'ID', - create_time datetime default current_timestamp , - update_time datetime default current_timestamp , - creator bigint, - delete_type int, - tenant_key varchar(10), - uuid char(36), - log_date datetime default current_timestamp , - log_operator varchar(50), - operatorName varchar(50), - targetId varchar(50), - targetName text, - modulename varchar(100), - functionname varchar(100), - interfaceName varchar(100), - requesturl varchar(200), - requesturi varchar(200), - operateType varchar(50), - operatetypename varchar(100), - operatedesc varchar(1000), - params longtext, - belongmainid varchar(36), - clientIp varchar(50), - groupid varchar(50), - device varchar(200), - groupNameLabel varchar(500), - redoService varchar(200), - redoContext longtext, - cancelService varchar(200), - cancelContext longtext, - totalruntime bigint, - mainruntime bigint, - log_result varchar(100), - fromterminal varchar(100), - resultdesc text, - old_content varchar(1000), - link_type varchar(20), - link_id bigint, - old_link_id bigint, - PRIMARY KEY (id) - ) - - - - create table ${mainTable} - ( - id number(*,0) not null primary key, - create_time date default sysdate, - update_time date default sysdate, - creator number(*,0), - delete_type number(*,0), - tenant_key varchar2(10), - uuid varchar2(36), - log_date date default sysdate, - log_operator varchar2(50), - operatorName varchar2(50), - targetId varchar2(50), - targetName varchar2(4000), - modulename varchar2(100), - functionname varchar2(100), - interfaceName varchar2(100), - requesturl varchar2(200), - requesturi varchar2(200), - operateType varchar2(50), - operatetypename varchar2(100), - operatedesc varchar2(1000), - params clob, - belongmainid varchar2(36), - clientIp varchar2(200), - groupid varchar2(50), - device varchar2(200), - groupNameLabel varchar2(500), - redoService varchar2(200), - redoContext varchar2(4000), - cancelService varchar2(200), - cancelContext varchar2(4000), - totalruntime number(*,0), - mainruntime number(*,0), - log_result varchar2(4000), - fromterminal varchar2(100), - resultdesc varchar2(4000), - old_content varchar2(1000), - link_type varchar2(20), - link_id number(*,0), - old_link_id number(*,0) - ) - - - create table ${mainTable} - ( - id bigint not null primary key, - create_time datetime default getdate(), - update_time datetime default getdate(), - creator bigint default '-1', - delete_type bigint default 0, - tenant_key nvarchar(10), - uuid nvarchar(36), - log_date datetime default getdate(), - device nvarchar(500), - log_operator bigint default '-1', - operatorname nvarchar(100), - targetid bigint default '-1', - targetname nvarchar(3000), - modulename nvarchar(100), - functionname nvarchar(100), - interfacename nvarchar(100), - requesturl nvarchar(200), - requesturi nvarchar(200), - operatetype nvarchar(50), - operatetypename nvarchar(100), - operatedesc nvarchar(3000), - params nvarchar(max), - belongmainid nvarchar(36), - clientip nvarchar(200), - groupid nvarchar(50), - groupnamelabel nvarchar(1000), - redoservice nvarchar(200), - redocontext nvarchar(3000), - cancelservice nvarchar(200), - cancelcontext nvarchar(3000), - totalruntime bigint default 0, - mainruntime bigint default 0, - log_result nvarchar(100), - fromterminal nvarchar(100), - resultdesc nvarchar(3000), - old_content nvarchar(3000), - link_type nvarchar(20), - link_id bigint default 0, - old_link_id bigint default 0 - ) - - - create table ${mainTable} - ( - id int8 not null primary key, - create_time timestamp default current_timestamp, - update_time timestamp default current_timestamp, - creator int8, - delete_type int, - tenant_key varchar(10), - uuid varchar(36), - log_date timestamp default current_timestamp, - log_operator varchar(50), - operatorName varchar(50), - targetId varchar(50), - targetName text, - modulename varchar(100), - functionname varchar(100), - interfaceName varchar(100), - requesturl varchar(200), - requesturi varchar(200), - operateType varchar(50), - operatetypename varchar(100), - operatedesc varchar(1000), - params text, - belongmainid varchar(36), - clientIp varchar(200), - groupid varchar(50), - device varchar(200), - groupNameLabel varchar(500), - redoService varchar(200), - redoContext text, - cancelService varchar(200), - cancelContext text, - totalruntime int4, - mainruntime int4, - log_result varchar(100), - fromterminal varchar(100), - resultdesc text, - old_content varchar(1000), - link_type varchar(20), - link_id int4, - old_link_id int4 - ) - - - create table ${detailTable} - ( - id bigint not null primary key, - create_time datetime default current_timestamp , - update_time datetime default current_timestamp , - creator bigint, - delete_type int, - tenant_key varchar(10), - uuid varchar(36), - mainid varchar(36), - dataid varchar(50), - belongdataid varchar(50), - tableName varchar(200), - tablenamelabelid varchar(50), - tablenamedesc varchar(50), - fieldName varchar(200), - fieldnamelabelid varchar(200), - newValue longtext, - oldValue longtext, - newrealvalue longtext, - oldrealvalue longtext, - fieldDesc varchar(200), - showorder int default 0, - isdetail int default 0 - ) - - - create table ${detailTable} - ( - id int8 not null primary key, - create_time timestamp default current_timestamp , - update_time timestamp default current_timestamp , - creator int8, - delete_type int8, - tenant_key varchar(10), - uuid varchar(36), - mainid varchar(36), - dataid varchar(50), - belongdataid varchar(50), - tableName varchar(200), - tablenamelabelid varchar(50), - tablenamedesc varchar(50), - fieldName varchar(200), - fieldnamelabelid varchar(200), - newValue text, - oldValue text, - newrealvalue text, - oldrealvalue text, - fieldDesc varchar(200), - showorder int8 default 0, - isdetail int8 default 0 - ) - - - create table ${detailTable} - ( - id number(*,0) not null primary key, - create_time date default sysdate, - update_time date default sysdate, - creator number(*,0), - delete_type number(*,0), - tenant_key varchar2(10), - uuid varchar2(36), - mainid varchar2(36), - dataid varchar2(50), - belongdataid varchar2(50), - tableName varchar2(200), - tablenamelabelid varchar2(50), - tablenamedesc varchar2(50), - fieldName varchar2(200), - fieldnamelabelid varchar2(200), - newValue CLOB, - oldValue CLOB, - newrealvalue CLOB, - oldrealvalue CLOB, - fieldDesc varchar2(200), - showorder number(*,0) default 0, - isdetail number(*,0) default 0 - ) - - - create table ${detailTable} - ( - id bigint not null primary key, - create_time datetime default getdate(), - update_time datetime default getdate(), - creator bigint, - delete_type bigint, - tenant_key nvarchar(10), - uuid nvarchar(36), - mainid nvarchar(36), - dataid nvarchar(50), - belongdataid nvarchar(50), - tableName nvarchar(200), - tablenamelabelid nvarchar(50), - tablenamedesc nvarchar(50), - fieldName nvarchar(200), - fieldnamelabelid nvarchar(200), - newValue nvarchar(max), - oldValue nvarchar(max), - newrealvalue nvarchar(max), - oldrealvalue nvarchar(max), - fieldDesc varchar(200), - showorder bigint default 0, - isdetail bigint default 0 - ) - - - - - - - - - - - ${createElogSql} - - - - - - - - - - - - - - - - create index idx${id} on ${tableName} (${columnName}) - - - - create index idx${id} on ${tableName} (${columnName}) - - - - create index idx${id} on ${tableName} (${columnName}) - - - - - - - - - - diff --git a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java deleted file mode 100644 index eda527efa..000000000 --- a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.mapper.elog; - - -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.entity.dto.LoggerDetailContext; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @ClassName: LocalElogAopDaoMapper - * @Description 本地操作日志持久层 - * @Author tanghj - * @Date 2021/2/24 9:35 - */ -public interface LocalElogAopDaoMapper { - - int insertElogContext(@Param(value="logContent") LoggerContext loggerContext, - @Param(value="cusColumns")String cusColumns , - @Param(value="cusValus")String cusValus, - @Param(value="tableName")String tableName); - - - - int insertElogDetail(@Param(value="detailContext") LoggerDetailContext loggerDetailContext, - @Param(value="mainid")String mainid, - @Param(value="cusColumns")String cusColumns , - @Param(value="cusValus")String cusValus, - @Param(value="detailTableName")String tableName); - - - Integer queryElogContextById(@Param(value="id")Long id, - @Param(value="tableName")String tableName); - - void batchInsertDetail(@Param("sql") String sql); - - void insertElogDetailPrepared(@Param("tablename") String detailTableName, @Param("list") List detailContexts, @Param("mainid") String mainid); - - void insertElogDetailPreparedHasCustonInfo(@Param("tablename") String detailTableName, @Param("list") List detailContexts, @Param("mainid") String mainid, @Param(value="cusColumns")String cusColumns); - - void rollBackElogById(@Param("id") Long id,@Param("tableName") String tableName); - - void rollBackDetailElogByUUID(@Param("mainid") String uuid,@Param("tableName") String detailTableName); - -} diff --git a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml b/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml deleted file mode 100644 index 81eb589f2..000000000 --- a/src/com/engine/salary/mapper/elog/LocalElogAopDaoMapper.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - insert into ${tableName} (id, uuid, log_date, tenant_key, modulename, functionName, operatetypename, - log_operator, operatorname, targetid, targetname, interfacename, operatetype, - operatedesc, - params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice, - cancelcontext, device, groupid, - belongMainId, requestUrl, requestUri, totalRunTime, mainRunTime, log_result, - fromTerminal, resultDesc, old_content, - link_type, link_id, old_link_id, create_time, update_time, delete_type, creator - ${cusColumns}) - values (#{logContent.id}, #{logContent.uuid}, #{logContent.date}, - #{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName}, - #{logContent.operateTypeName}, #{logContent.logOperator}, #{logContent.operatorName}, - #{logContent.logTargetid} - , #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType}, - #{logContent.operatedesc}, - #{logContent.paramsStr}, #{logContent.clientIp}, #{logContent.groupNameLabel}, - #{logContent.redoService}, - #{logContent.redoContextStr}, #{logContent.cancelService}, #{logContent.cancelContextStr}, - #{logContent.device}, #{logContent.groupId}, - #{logContent.belongMainId}, #{logContent.requestUrl}, #{logContent.requestUri}, - #{logContent.totalRunTime}, #{logContent.mainRunTime} - , #{logContent.result}, #{logContent.fromTerminal}, #{logContent.resultDesc}, - #{logContent.old_content}, #{logContent.link_type} - , #{logContent.link_id}, #{logContent.old_link_id}, #{logContent.create_time}, - #{logContent.update_time}, #{logContent.delete_type}, #{logContent.logOperator} - ${cusValus}) - - - - insert into ${detailTableName} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, - fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key, creator, - newRealValue, oldRealValue, tableNameDesc, - tableNameLabelId, fieldNameLabelId, create_time, update_time - ${cusColumns}) - values (#{detailContext.id}, #{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, - #{detailContext.fieldName}, #{detailContext.newValue}, - #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, - #{detailContext.dataid}, - #{detailContext.belongDataid}, #{detailContext.isDetail}, #{detailContext.tenant_key}, - #{detailContext.creator}, #{detailContext.newRealValue} - , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, - #{detailContext.fieldNameLabelId}, #{detailContext.create_time}, #{detailContext.update_time} - ${cusValus}) - - - ${sql} - - - - - - - - insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, - fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, - oldRealValue,tableNameDesc, - tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) - values - - ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, - #{detailContext.fieldName}, #{detailContext.newValue}, - #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, - #{detailContext.belongDataid}, #{detailContext.isDetail}, - #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} - , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, - #{detailContext.fieldNameLabelId} - , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}) - - - - - - insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, - fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, - oldRealValue,tableNameDesc, - tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) - VALUES - ( - #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, - #{detailContext.fieldName}, #{detailContext.newValue}, - #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, - #{detailContext.belongDataid}, #{detailContext.isDetail}, - #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} - , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, - #{detailContext.fieldNameLabelId} - , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type} - ) - - - - - insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, - fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, - oldRealValue,tableNameDesc, - tableNameLabelId,fieldNameLabelId, create_time, update_time - ${cusColumns}) - values - - ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, - #{detailContext.fieldName}, #{detailContext.newValue}, - #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, - #{detailContext.belongDataid}, #{detailContext.isDetail}, - #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} - , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, - #{detailContext.fieldNameLabelId} - , #{detailContext.create_time}, #{detailContext.update_time} - ${detailContext.cusValus}) - - - - - update ${tableName} - set delete_type = 3 - where id = #{id} - - - update ${tableName} - set delete_type = 3 - where mainid = #{mainid} - - - - insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, - fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, - oldRealValue,tableNameDesc, - tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) - - SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, - #{detailContext.fieldName}, #{detailContext.newValue}, - #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, - #{detailContext.belongDataid}, #{detailContext.isDetail}, - #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} - , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, - #{detailContext.fieldNameLabelId} - , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type} - FROM DUAL - - - - - insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, - fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, - oldRealValue,tableNameDesc, - tableNameLabelId,fieldNameLabelId, create_time, update_time - ${cusColumns}) - - SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, - #{detailContext.fieldName}, #{detailContext.newValue}, - #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, - #{detailContext.belongDataid}, #{detailContext.isDetail}, - #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} - , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, - #{detailContext.fieldNameLabelId} - , #{detailContext.create_time}, #{detailContext.update_time} - ${detailContext.cusValus} - FROM DUAL - - - - diff --git a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java deleted file mode 100644 index 70807d832..000000000 --- a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.java +++ /dev/null @@ -1,219 +0,0 @@ -package com.engine.salary.mapper.elog; - -import com.engine.salary.elog.entity.dto.LoggerContext; -import com.engine.salary.elog.entity.dto.ReadInfoEntity; -import com.github.pagehelper.Page; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: LocalElogDao - * @Description 本地操作日志持久层 - * @Author tanghj - * @Date 2021/2/24 9:35 - */ -public interface LocalElogDaoMapper { - - - List> queryCardElogList(@Param(value = "logContent") LoggerContext loggerContext, - @Param("limit") String limit, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql); - - List queryElogList(@Param(value = "page") Page page, - @Param(value = "logContent") LoggerContext loggerContext, - @Param("limit") String limit, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "columns") String columns); - - List queryElogListPapi(@Param(value = "page") Page page, - @Param(value = "logContent") LoggerContext loggerContext, - @Param("limit") String limit, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "columns") String columns); - - // @WeaDataPermission(mainDataTable = "#{mainDataTable}", -// permissionId = "#{permissionId}", -// permissionType = "#{permissionType}", -// mainDataTableAlias = "#{mainDataTableAlias}", -// primaryKey = "#{primaryKey}", -// permissionTargetId = "#{permissionTargetId}", -// permissionConfigSourceId = "#{permissionConfigSourceId}", -// permissionExcept = "true") - List queryElogList(@Param(value = "page") Page page, @Param(value = "logContent") LoggerContext loggerContext, - @Param("limit") String limit, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "mainDataTable") String mainDataTable, - @Param(value = "permissionId") String permissionId, - @Param(value = "permissionType") String permissionType, - @Param(value = "mainDataTableAlias") String mainDataTableAlias, - @Param(value = "primaryKey") String primaryKey, - @Param(value = "permissionTargetId") String permissionTargetId, - @Param(value = "permissionConfigSourceId") String permissionConfigSourceId, - @Param(value = "columns") String columns - ); - - // @WeaDataPermission(mainDataTable = "#{mainDataTable}", -// permissionId = "#{permissionId}", -// permissionType = "#{permissionType}", -// mainDataTableAlias = "#{mainDataTableAlias}", -// primaryKey = "#{primaryKey}", -// permissionExcept = "true") - List queryElogListPapi(@Param(value = "page") Page page, @Param(value = "logContent") LoggerContext loggerContext, - @Param("limit") String limit, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "mainDataTable") String mainDataTable, - @Param(value = "permissionId") String permissionId, - @Param(value = "permissionType") String permissionType, - @Param(value = "mainDataTableAlias") String mainDataTableAlias, - @Param(value = "primaryKey") String primaryKey, - @Param(value = "columns") String columns - ); - - List queryAllChanges(@Param(value = "tableName") String tableName, @Param("mainid") String mainid); - - Map elogCount(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql); - - Map elogCountPapi(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql); - - - // @WeaDataPermission(mainDataTable = "#{mainDataTable}", -// permissionId = "#{permissionId}", -// permissionType = "#{permissionType}", -// mainDataTableAlias = "#{mainDataTableAlias}", -// primaryKey = "#{primaryKey}", -// permissionTargetId = "#{permissionTargetId}", -// permissionConfigSourceId = "#{permissionConfigSourceId}", -// permissionExcept = "true") - Map elogCountByMorePermission(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "mainDataTable") String mainDataTable, - @Param(value = "permissionId") String permissionId, - @Param(value = "permissionType") String permissionType, - @Param(value = "mainDataTableAlias") String mainDataTableAlias, - @Param(value = "primaryKey") String primaryKey, - @Param(value = "permissionTargetId") String permissionTargetId, - @Param(value = "permissionConfigSourceId") String permissionConfigSourceId); - - // @WeaDataPermission(mainDataTable = "#{mainDataTable}", -// permissionId = "#{permissionId}", -// permissionType = "#{permissionType}", -// mainDataTableAlias = "#{mainDataTableAlias}", -// primaryKey = "#{primaryKey}", -// permissionTargetId = "#{permissionTargetId}", -// permissionConfigSourceId = "#{permissionConfigSourceId}", -// permissionCount = "count(*)", -// permissionExcept = "true") - Long elogCountOnlyNum(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "mainDataTable") String mainDataTable, - @Param(value = "permissionId") String permissionId, - @Param(value = "permissionType") String permissionType, - @Param(value = "mainDataTableAlias") String mainDataTableAlias, - @Param(value = "primaryKey") String primaryKey, - @Param(value = "permissionTargetId") String permissionTargetId, - @Param(value = "permissionConfigSourceId") String permissionConfigSourceId); - - - // @WeaDataPermission(mainDataTable = "#{mainDataTable}", -// permissionId = "#{permissionId}", -// permissionType = "#{permissionType}", -// mainDataTableAlias = "#{mainDataTableAlias}", -// primaryKey = "#{primaryKey}", -// permissionExcept = "true") - Map elogCount(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "mainDataTable") String mainDataTable, - @Param(value = "permissionId") String permissionId, - @Param(value = "permissionType") String permissionType, - @Param(value = "mainDataTableAlias") String mainDataTableAlias, - @Param(value = "primaryKey") String primaryKey); - - // @WeaDataPermission(mainDataTable = "#{mainDataTable}", -// permissionId = "#{permissionId}", -// permissionType = "#{permissionType}", -// mainDataTableAlias = "#{mainDataTableAlias}", -// primaryKey = "#{primaryKey}", -// permissionExcept = "true") - Map elogCountPapi(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql, - @Param(value = "mainDataTable") String mainDataTable, - @Param(value = "permissionId") String permissionId, - @Param(value = "permissionType") String permissionType, - @Param(value = "mainDataTableAlias") String mainDataTableAlias, - @Param(value = "primaryKey") String primaryKey); - - - List queryDetailElogList(@Param(value = "logContent") LoggerContext loggerContext, - @Param("limit") String limit, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql); - - Map elogDetailCount(@Param(value = "logContent") LoggerContext loggerContext, - @Param(value = "tableName") String tableName, - @Param(value = "conditionSql") String conditionSql); - -// List queryOperators(@Param(value = "tableName") String tableName, -// @Param(value = "targetId") String targetId, -// @Param(value = "operateType") String operateType); - - List queryReadInfoOperators(@Param(value = "tableName") String tableName, - @Param(value = "targetId") String targetId, - @Param(value = "operateType") String operateType, - @Param(value = "flag") Boolean flag); - - List queryReadInfoDateOperators(@Param(value = "tableName") String tableName, - @Param(value = "targetId") String targetId, - @Param(value = "operateType") String operateType, - @Param(value = "flag") Boolean flag, - @Param(value = "startDate") String startDate, - @Param(value = "endDate") String endDate); - - List queryAllMainData(@Param(value = "tableName") String tableName, @Param("uuid") String uuid); - - List queryAllMainChanges(@Param(value = "tableName") String tableName, @Param("mainid") String mainid); - - List queryAllDetailChanges(@Param(value = "tableName") String tableName, @Param("mainid") String mainid); - - Integer queryElogContextById(@Param(value = "id") Long id, - @Param(value = "tableName") String tableName); - - List queryElogTraceInfo(@Param(value = "traceId") String traceId, - @Param(value = "tableName") String tableName, - @Param(value = "offset") Integer offset, - @Param(value = "pageSize") Integer pageSize); - - int queryElogTraceInfoCount(@Param(value = "traceId") String traceId, - @Param(value = "tableName") String tableName); - - List queryLogInfoByCustom(@Param(value = "tableName") String tableName, - @Param(value = "sql") String sql); - - List queryAllChangesData(@Param("tableName") String tableName, @Param("mainid") String mainid); - - List queryTenantKeyOperators(@Param(value = "tableName") String tableName, - @Param(value = "tenantKey") String tenantKey, - @Param(value = "targetId") String targetId, - @Param(value = "operateType") String operateType, - @Param(value = "flag") Boolean flag); - - List queryAllChangesDataPages(@Param("tableName") String tableName, - @Param("mainid") String mainid, - @Param(value = "page") Page page); - - Integer queryAllChangesPageCounts(@Param("tableName") String tableName, @Param("mainid") String mainid); -} diff --git a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml b/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml deleted file mode 100644 index 93c233896..000000000 --- a/src/com/engine/salary/mapper/elog/LocalElogDaoMapper.xml +++ /dev/null @@ -1,412 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java b/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java deleted file mode 100644 index 0a8e14928..000000000 --- a/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.engine.salary.mapper.elog; - -import java.util.Map; - -public interface QueryCurretValusMapper { - - Map queryValues(String sql); -} diff --git a/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml b/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml deleted file mode 100644 index c3d7a16d1..000000000 --- a/src/com/engine/salary/mapper/elog/QueryCurretValusMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file From 8213eedbc53a5b9ba0146432f4d3ebac0a0c95e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 6 Feb 2024 14:12:24 +0800 Subject: [PATCH 095/169] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/lib/hrmelog.jar | Bin 0 -> 143257 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resource/WEB-INF/lib/hrmelog.jar diff --git a/resource/WEB-INF/lib/hrmelog.jar b/resource/WEB-INF/lib/hrmelog.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b2ea6e7994bf51932e268d3d64c0a907c76194b GIT binary patch literal 143257 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�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

xj7bUX{DF}iX}k$Fq8Lc>>>Nq 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 LA_Bh!1N;8~8Xh;+ literal 0 HcmV?d00001 From 6a79b22c1720aeacdbddd8a2d7e8f2b0ba0fe9c5 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 7 Feb 2024 17:39:26 +0800 Subject: [PATCH 096/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../po/InsuranceArchivesBaseInfoPO.java | 15 + .../po/InsuranceArchivesFundSchemePO.java | 20 + .../po/InsuranceArchivesOtherSchemePO.java | 18 + .../po/InsuranceArchivesSocialSchemePO.java | 19 + .../service/impl/SIArchivesServiceImpl.java | 981 +++++++++++------- .../service/impl/SICategoryServiceImpl.java | 112 +- .../service/impl/SISchemeServiceImpl.java | 272 +++-- 7 files changed, 934 insertions(+), 503 deletions(-) diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java index f05cc309d..1ed65489f 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siarchives.po; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -19,65 +20,78 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_insurance_base_info +@ElogTransform(name = "福利档案主表") public class InsuranceArchivesBaseInfoPO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 员工id */ + @ElogTransform(name = "员工id") private Long employeeId; /** * 个税扣缴义务人id */ + @ElogTransform(name = "个税扣缴义务人id") private Long paymentOrganization; /** * 社保档案id */ + @ElogTransform(name = "社保档案id") private Long socialArchivesId; /** * 公积金档案id */ + @ElogTransform(name = "公积金档案id") private Long fundArchivesId; /** * 其他福利档案id */ + @ElogTransform(name = "其他福利档案id") private Long otherArchivesId; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; /** * 福利执行状态 */ + @ElogTransform(name = "福利执行状态") private String runStatus; /** @@ -85,6 +99,7 @@ public class InsuranceArchivesBaseInfoPO { * * @see DataCollectionEmployeeTypeEnum */ + @ElogTransform(name = "人员类型") private Integer employeeType; //---------条件------- diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java index fc171c94b..15e37cfb0 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.siarchives.po; import com.engine.salary.annotation.Encrypt; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,35 +20,42 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_fund_archives +@ElogTransform(name = "福利档案明细表-公积金信息") public class InsuranceArchivesFundSchemePO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 员工id */ + @ElogTransform(name = "员工id") private Long employeeId; /** * 福利类型 */ + @ElogTransform(name = "福利类型") private Integer welfareType; /** * 暂不缴纳 */ + @ElogTransform(name = "是否暂不缴纳") private Integer nonPayment; /** * 公积金起始缴纳月 */ + @ElogTransform(name = "公积金起始缴纳月") private String fundStartTime; /** * 公积金最后缴纳月 */ + @ElogTransform(name = "公积金最后缴纳月") private String fundEndTime; /** @@ -59,63 +67,75 @@ public class InsuranceArchivesFundSchemePO { /** * 公积金方案id */ + @ElogTransform(name = "公积金方案id") private Long fundSchemeId; /** * 公积金账号 */ + @ElogTransform(name = "公积金账号") private String fundAccount; /** * 补充公积金账号 */ + @ElogTransform(name = "补充公积金账号") private String supplementFundAccount; /** * 公积金缴纳组织 */ + @ElogTransform(name = "公积金缴纳组织") private Long paymentOrganization; /** * 公积金个人实际承担方 */ + @ElogTransform(name = "公积金个人实际承担方") private Integer underTake; /** * 公积金缴纳基数 */ @Encrypt + @ElogTransform(name = "公积金缴纳基数") private String fundPaymentBaseString; /** * 公积金缴纳基数——单位 */ @Encrypt + @ElogTransform(name = "公积金缴纳基数——单位") private String fundPaymentComBaseString; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; } diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java index 9ad9d9668..71836e143 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.siarchives.po; import com.engine.salary.annotation.Encrypt; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,35 +20,42 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_other_archives +@ElogTransform(name = "福利档案明细表-其他福利信息") public class InsuranceArchivesOtherSchemePO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 员工id */ + @ElogTransform(name = "员工id") private Long employeeId; /** * 暂不缴纳 */ + @ElogTransform(name = "是否暂不缴纳") private Integer nonPayment; /** * 福利类型 */ + @ElogTransform(name = "福利类型") private Integer welfareType; /** * 其他福利起始缴纳月 */ + @ElogTransform(name = "其他福利起始缴纳月") private String otherStartTime; /** * 其他福利最后缴纳月 */ + @ElogTransform(name = "其他福利最后缴纳月") private String otherEndTime; /** @@ -59,52 +67,62 @@ public class InsuranceArchivesOtherSchemePO { /** * 其他福利方案id */ + @ElogTransform(name = "其他福利方案id") private Long otherSchemeId; /** * 其他福利缴纳组织 */ + @ElogTransform(name = "其他福利缴纳组织") private Long paymentOrganization; /** * 其他福利个人实际承担方 */ + @ElogTransform(name = "其他福利个人实际承担方") private Integer underTake; /** * 其他福利缴纳基数 */ @Encrypt + @ElogTransform(name = "其他福利缴纳基数") private String otherPaymentBaseString; /** * 其他福利缴纳基数——单位 */ @Encrypt + @ElogTransform(name = "其他福利缴纳基数——单位") private String otherPaymentComBaseString; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; } diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java index 645e5215b..5e5c3cf9e 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.siarchives.po; import com.engine.salary.annotation.Encrypt; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,36 +20,43 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_social_archives +@ElogTransform(name = "福利档案明细表-社保信息") public class InsuranceArchivesSocialSchemePO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 员工id */ + @ElogTransform(name = "员工id") private Long employeeId; /** * 暂不缴纳 */ + @ElogTransform(name = "是否暂不缴纳") private Integer nonPayment; /** * 福利类型 */ + @ElogTransform(name = "福利类型") private Integer welfareType; /** * 社保起始缴纳月 */ + @ElogTransform(name = "社保起始缴纳月") private String socialStartTime; /** * 社保最后缴纳月 */ + @ElogTransform(name = "社保最后缴纳月") private String socialEndTime; /** @@ -60,57 +68,68 @@ public class InsuranceArchivesSocialSchemePO { /** * 社保方案id */ + @ElogTransform(name = "社保方案id") private Long socialSchemeId; /** * 社保账号 */ + @ElogTransform(name = "社保账号") private String socialAccount; /** * 社保缴纳组织 */ + @ElogTransform(name = "社保缴纳组织") private Long paymentOrganization; /** * 社保个人实际承担方 */ + @ElogTransform(name = "社保个人实际承担方") private Integer underTake; /** * 社保缴纳基数 */ @Encrypt + @ElogTransform(name = "社保缴纳基数") private String socialPaymentBaseString; /** * 社保缴纳基数——单位 */ @Encrypt + @ElogTransform(name = "社保缴纳基数——单位") private String socialPaymentComBaseString; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 798eed713..5f317d94b 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -18,7 +18,9 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.cmd.siarchives.SIArchivesTipsCmd; import com.engine.salary.common.SalaryContext; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBO; @@ -33,6 +35,7 @@ import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentEmpChangePO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum; @@ -40,6 +43,7 @@ import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.sicategory.*; import com.engine.salary.enums.taxagent.TaxAgentEmpChangeModuleEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.datacollection.EmployMapper; import com.engine.salary.mapper.siarchives.*; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; @@ -152,6 +156,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return ServiceUtil.getService(SISchemeServiceImpl.class,user); } + private EmployMapper getEmployMapper() { + return MapperProxyFactory.getProxy(EmployMapper.class); + } + @Override public Map getTips(Map params) { return commandExecutor.execute(new SIArchivesTipsCmd(params, user)); @@ -172,6 +180,18 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService Long paymentOrganization = welfareTypeEnum != null ? Long.valueOf(Util.null2String(params.get("paymentOrganization"))) : null; // apidatas = siArchivesBiz.getBaseForm(welfareTypeEnum, employeeId, (long) user.getUID(), user, paymentOrganization); apidatas = getBaseForm(welfareTypeEnum, employeeId, paymentOrganization, taxAgentPOS); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); +// loggerContext.setTargetId(String.valueOf(form.getId())); +// loggerContext.setTargetName(form.getInsuranceName()); + loggerContext.setOperateType(OperateTypeEnum.READ.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看福利档案基础信息")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看福利档案基础信息") + + ": " + "人员id" + "-" + employeeId + "," + "个税扣缴义务人id" + "-" +paymentOrganization + "," + + (welfareTypeEnum == null ? SalaryI18nUtil.getI18nLabel(0, "员工基本信息") + : SalaryI18nUtil.getI18nLabel(welfareTypeEnum.getLabelId(), welfareTypeEnum.getDefaultLabel()))); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); return apidatas; } @@ -188,6 +208,17 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } // apidatas = siArchivesBiz.getPaymentForm(user, welfareTypeEnum, employeeId, (long) user.getUID(), schemeId, paymentOrganization); apidatas = getPaymentForm(user, welfareTypeEnum, employeeId, schemeId, paymentOrganization); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); +// loggerContext.setTargetId(String.valueOf(form.getId())); +// loggerContext.setTargetName(form.getInsuranceName()); + loggerContext.setOperateType(OperateTypeEnum.READ.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看福利档案缴纳基数")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看缴纳基数明细") + + ": " + "人员id" + "-" + employeeId + "," + "个税扣缴义务人id" + "-" +paymentOrganization + "," + + SalaryI18nUtil.getI18nLabel(welfareTypeEnum.getLabelId(), welfareTypeEnum.getDefaultLabel())); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); return apidatas; } @@ -477,7 +508,13 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService List socialArchiveDelIds = insuranceArchivesList.stream().map(InsuranceArchivesBaseInfoPO::getSocialArchivesId).collect(Collectors.toList()); List fundArchiveDelIds = insuranceArchivesList.stream().map(InsuranceArchivesBaseInfoPO::getFundArchivesId).collect(Collectors.toList()); List otherArchiveDelIds = insuranceArchivesList.stream().map(InsuranceArchivesBaseInfoPO::getOtherArchivesId).collect(Collectors.toList()); - + //获取子表数据，方便记录操作日志 + List socialArchives = getSocialSchemeMapper().getSocialById(socialArchiveDelIds); + List fundArchives = getFundSchemeMapper().getFundById(fundArchiveDelIds); + List otherArchives = getOtherSchemeMapper().getOtherById(otherArchiveDelIds); + Map socialArchiveMap = SalaryEntityUtil.convert2Map(socialArchives, InsuranceArchivesSocialSchemePO::getId); + Map fundArchiveMap = SalaryEntityUtil.convert2Map(fundArchives, InsuranceArchivesFundSchemePO::getId); + Map otherArchiveMap = SalaryEntityUtil.convert2Map(otherArchives, InsuranceArchivesOtherSchemePO::getId); // 删除社保档案主表及3张明细表数据 if(CollectionUtils.isNotEmpty(archiveDelIds)){ getInsuranceBaseInfoMapper().deleteByIds(archiveDelIds); @@ -491,6 +528,65 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if(CollectionUtils.isNotEmpty(otherArchiveDelIds)){ getOtherSchemeMapper().deleteByIds(otherArchiveDelIds); } + //记录操作日志 + List targetPOList = insuranceArchivesList.stream().filter(f -> archiveDelIds.contains(f.getId())).collect(Collectors.toList()); + if (targetPOList.size() > 0) { + targetPOList.forEach(targetPO -> { + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + targetPO.setDeleteType(DeleteTypeEnum.DELETED.getValue()); + //记录主表操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利档案主表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利档案") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setNewValues(targetPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + //记录明细表操作日志 + InsuranceArchivesSocialSchemePO socialTargetDetail = socialArchiveMap.get(targetPO.getSocialArchivesId()); + if (socialTargetDetail != null) { + socialTargetDetail.setDeleteType(DeleteTypeEnum.DELETED.getValue()); + LoggerContext detailLoggerContext = new LoggerContext<>(); + detailLoggerContext.setUser(user); + detailLoggerContext.setTargetId(String.valueOf(targetPO.getId())); + detailLoggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + detailLoggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + detailLoggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利档案-社保明细")); + detailLoggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利档案-社保明细") + ":" + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + detailLoggerContext.setNewValues(socialTargetDetail); + SalaryElogConfig.siArchivesLoggerTemplate.write(detailLoggerContext); + } + InsuranceArchivesFundSchemePO fundTargetDetail = fundArchiveMap.get(targetPO.getFundArchivesId()); + if (fundTargetDetail != null) { + fundTargetDetail.setDeleteType(DeleteTypeEnum.DELETED.getValue()); + LoggerContext detailLoggerContext = new LoggerContext<>(); + detailLoggerContext.setUser(user); + detailLoggerContext.setTargetId(String.valueOf(targetPO.getId())); + detailLoggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + detailLoggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + detailLoggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利档案-公积金明细")); + detailLoggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利档案-公积金明细") + ":" + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + detailLoggerContext.setNewValues(fundTargetDetail); + SalaryElogConfig.siArchivesLoggerTemplate.write(detailLoggerContext); + } + InsuranceArchivesOtherSchemePO otherTargetDetail = otherArchiveMap.get(targetPO.getOtherArchivesId()); + if (otherTargetDetail != null) { + otherTargetDetail.setDeleteType(DeleteTypeEnum.DELETED.getValue()); + LoggerContext detailLoggerContext = new LoggerContext<>(); + detailLoggerContext.setUser(user); + detailLoggerContext.setTargetId(String.valueOf(targetPO.getId())); + detailLoggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + detailLoggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + detailLoggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利档案-其他福利明细")); + detailLoggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利档案-其他福利明细") + ":" + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + detailLoggerContext.setNewValues(otherTargetDetail); + SalaryElogConfig.siArchivesLoggerTemplate.write(detailLoggerContext); + } + }); + } } //新增社保、公积金、其他福利档案、福利档案基础信息 @@ -781,12 +877,28 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } /** - * 批量变更档案列表的runStatus + * 批量变更档案列表的runStatus，目前仅在待增员tab中删除待办使用，后边其他方调用时需修改操作日志记录 */ @Override public void updateRunStatus(InsuranceArchivesBaseInfoPO po) { - getInsuranceBaseInfoMapper().updateRunStatusByIds(po); + //记录操作日志 + List targetPOList = getInsuranceBaseInfoMapper().listByIds(po.getIds()); + if (targetPOList != null && targetPOList.size() > 0) { + targetPOList.forEach(targetPO -> { + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "待增员档案-删除待办")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "待增员档案-删除待办") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); +// loggerContext.setNewValues(targetPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + }); + } } @Override @@ -828,7 +940,23 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (stayDelPO.getIds().size() > 0) { getInsuranceBaseInfoMapper().updateRunStatusByIds(stayDelPO); } - + //记录操作日志 + Map oldBaseInfoMap = SalaryEntityUtil.convert2Map(pos, e -> e.getPaymentOrganization() + "-" + e.getEmployeeId()); + List newPos = getInsuranceBaseInfoMapper().listByIds(ids); + newPos.forEach(targetPO -> { + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "停缴档案-取消停缴")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "停缴档案-取消停缴") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOldValues(oldBaseInfoMap.get(targetPO.getPaymentOrganization() + "-" + targetPO.getEmployeeId())); + loggerContext.setNewValues(targetPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + }); } /** @@ -908,6 +1036,24 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (toStopBaseInfoIdList.size() > 0) { getInsuranceBaseInfoMapper().updateRunStatusByIds(InsuranceArchivesBaseInfoPO.builder() .ids(toStopBaseInfoIdList).runStatus(EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue()).build()); + + //记录操作日志 + toStopBaseInfoIdList.forEach(f -> { + InsuranceArchivesBaseInfoPO targetPO = getInsuranceBaseInfoMapper().getById(f); + if (targetPO != null) { + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案减员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "停缴一名在缴员工") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setNewValues(targetPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + } + }); } Map resultMap = new HashMap<>(2); @@ -1127,6 +1273,23 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .ids(part).runStatus(EmployeeStatusEnum.PAYING.getValue()).build()); }); + //记录操作日志 + toPayBaseInfoIdList.forEach(f -> { + InsuranceArchivesBaseInfoPO targetPO = getInsuranceBaseInfoMapper().getById(f); + if (targetPO != null) { + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案增员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "增加一名在缴员工") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setNewValues(targetPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + } + }); } Map resultMap = new HashMap<>(2); @@ -1239,7 +1402,19 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .runStatus(EmployeeStatusEnum.PAYING.getValue()) .build()); }); - + nowList.forEach(targetPO -> { + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "待减员档案-删除待办")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "待减员档案-删除待办") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); +// loggerContext.setNewValues(targetPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + }); } } @@ -2725,145 +2900,157 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService public void otherSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { long employeeId = user.getUID(); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); + InsuranceArchivesOtherSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesOtherSaveParam.class); + SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0, "员工id为空"), param, param.getEmployeeId()); - InsuranceArchivesOtherSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesOtherSaveParam.class); - SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0, "员工id为空"), param, param.getEmployeeId()); + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) && !SalaryDateUtil.checkYearMonth(param.getOtherStartTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "其他福利起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) && !SalaryDateUtil.checkYearMonth(param.getOtherEndTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "其他福利最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + //创建操作日志记录对象 + InsuranceArchivesBaseInfoPO targetPO = new InsuranceArchivesBaseInfoPO(); + InsuranceArchivesOtherSchemePO targetDetailPO = new InsuranceArchivesOtherSchemePO(); - if (org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) && !SalaryDateUtil.checkYearMonth(param.getOtherStartTime())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "其他福利起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); - } - if (org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) && !SalaryDateUtil.checkYearMonth(param.getOtherEndTime())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "其他福利最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); - } - - List otherIds = new ArrayList(); - otherIds.add(param.getId()); - List oldOtherInfoList = otherSchemeMapper.getOtherById(otherIds); + List otherIds = new ArrayList(); + otherIds.add(param.getId()); + List oldOtherInfoList = getOtherSchemeMapper().getOtherById(otherIds); + //设置福利档案基数调整记录数据 + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(param.getOtherSchemeId()) + .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + if (oldOtherInfoList.size() == 1) { + InsuranceArchivesOtherSchemePO oldOtherInfo = oldOtherInfoList.get(0); //设置福利档案基数调整记录数据 - InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() - .adjustAfterSchemeId(param.getOtherSchemeId()) - .adjustAfterBaseJson(paramReq.getPaymentForm()) - .adjustAfterComBaseJson(paramReq.getPaymentComForm()) - .welfareType(paramReq.getWelfareType().getValue()) - .employeeId(param.getEmployeeId()) - .paymentOrganization(param.getPaymentOrganization()) - .build(); - - if (oldOtherInfoList.size() == 1) { - InsuranceArchivesOtherSchemePO oldOtherInfo = oldOtherInfoList.get(0); - //设置福利档案基数调整记录数据 - encryptUtil.decrypt(oldOtherInfo, InsuranceArchivesOtherSchemePO.class); - adjustInfo.setAdjustBeforeBaseJson(oldOtherInfo.getOtherPaymentBaseString()); - adjustInfo.setAdjustBeforeSchemeId(oldOtherInfo.getOtherSchemeId()); - adjustInfo.setAdjustBeforeComBaseJson(oldOtherInfo.getOtherPaymentComBaseString()); - //新数据 - InsuranceArchivesOtherSchemePO updateOtherInfo = - InsuranceArchivesOtherSchemePO.builder() - .id(oldOtherInfo.getId()) - .otherSchemeId(param.getOtherSchemeId()) - .otherStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) ? param.getOtherStartTime() : null) - .underTake(param.getUnderTake()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .welfareType(paramReq.getWelfareType().getValue()) - .otherEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) ? param.getOtherEndTime() : null) - .employeeId(param.getEmployeeId()) - .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .updateTime(new Date()) - .nonPayment(param.getNonPayment()) - .creator(employeeId) - .paymentOrganization(param.getPaymentOrganization()) - .otherPaymentBaseString(paramReq.getPaymentForm()) - .build(); - //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + encryptUtil.decrypt(oldOtherInfo, InsuranceArchivesOtherSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldOtherInfo.getOtherPaymentBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldOtherInfo.getOtherSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldOtherInfo.getOtherPaymentComBaseString()); + //新数据 + InsuranceArchivesOtherSchemePO updateOtherInfo = + InsuranceArchivesOtherSchemePO.builder() + .id(oldOtherInfo.getId()) + .otherSchemeId(param.getOtherSchemeId()) + .otherStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) ? param.getOtherStartTime() : null) + .underTake(param.getUnderTake()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .welfareType(paramReq.getWelfareType().getValue()) + .otherEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) ? param.getOtherEndTime() : null) + .employeeId(param.getEmployeeId()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .updateTime(new Date()) + .nonPayment(param.getNonPayment()) + .creator(employeeId) + .paymentOrganization(param.getPaymentOrganization()) + .otherPaymentBaseString(paramReq.getPaymentForm()) + .build(); + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); } - //需要拆分个人和公司福利基数时 - if (welBaseDiffSign) { - updateOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); - //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(updateOtherInfo.getOtherSchemeId(),updateOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } + } + encryptUtil.encrypt(updateOtherInfo, InsuranceArchivesOtherSchemePO.class); + getOtherSchemeMapper().updateById(updateOtherInfo); + //更新base_info表状态 + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + //对于非系统人员，编辑后状态切换为正在缴纳 + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + baseInfoPO.setOtherArchivesId(updateOtherInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + + targetPO = baseInfoPO; + encryptUtil.decrypt(updateOtherInfo, InsuranceArchivesOtherSchemePO.class); + targetDetailPO = updateOtherInfo; + } else { + getOtherSchemeMapper().deleteByEmployeeIdAndPayOrg(InsuranceArchivesOtherSchemePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + //新建社保档案，并关联主表 + InsuranceArchivesOtherSchemePO insertOtherInfo = InsuranceArchivesOtherSchemePO.builder() + .otherSchemeId(param.getOtherSchemeId()) + .otherStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) ? param.getOtherStartTime() : null) + .underTake(param.getUnderTake()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .welfareType(paramReq.getWelfareType().getValue()) + .otherEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) ? param.getOtherEndTime() : null) + .employeeId(param.getEmployeeId()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .createTime(new Date()) + .updateTime(new Date()) + .nonPayment(param.getNonPayment()) + .creator(employeeId) + .paymentOrganization(param.getPaymentOrganization()) + .otherPaymentBaseString(paramReq.getPaymentForm()) + .build(); + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); } - encryptUtil.encrypt(updateOtherInfo, InsuranceArchivesOtherSchemePO.class); - otherSchemeMapper.updateById(updateOtherInfo); - //更新base_info表状态 - InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { - //对于非系统人员，编辑后状态切换为正在缴纳 - baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - } - baseInfoPO.setOtherArchivesId(updateOtherInfo.getId()); - getInsuranceBaseInfoMapper().updateById(baseInfoPO); - sqlSession.commit(); - } else { - otherSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesOtherSchemePO.builder() + } + encryptUtil.encrypt(insertOtherInfo, InsuranceArchivesOtherSchemePO.class); + getOtherSchemeMapper().insert(insertOtherInfo); + + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null) { + List otherInfos = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() .employeeId(param.getEmployeeId()) .paymentOrganization(param.getPaymentOrganization()) .build()); - //新建社保档案，并关联主表 - InsuranceArchivesOtherSchemePO insertOtherInfo = InsuranceArchivesOtherSchemePO.builder() - .otherSchemeId(param.getOtherSchemeId()) - .otherStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherStartTime()) ? param.getOtherStartTime() : null) - .underTake(param.getUnderTake()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .welfareType(paramReq.getWelfareType().getValue()) - .otherEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) ? param.getOtherEndTime() : null) - .employeeId(param.getEmployeeId()) - .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .createTime(new Date()) - .updateTime(new Date()) - .nonPayment(param.getNonPayment()) - .creator(employeeId) - .paymentOrganization(param.getPaymentOrganization()) - .otherPaymentBaseString(paramReq.getPaymentForm()) - .build(); - //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + baseInfoPO.setOtherArchivesId(otherInfos.get(0).getId()); + //对于非系统人员，编辑后状态切换为正在缴纳 + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); } - //需要拆分个人和公司福利基数时 - if (welBaseDiffSign) { - insertOtherInfo.setOtherPaymentComBaseString(paramReq.getPaymentComForm()); - //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(insertOtherInfo.getOtherSchemeId(),insertOtherInfo.getOtherPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"其他福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } - } - encryptUtil.encrypt(insertOtherInfo, InsuranceArchivesOtherSchemePO.class); - otherSchemeMapper.insert(insertOtherInfo); - sqlSession.commit(); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); - InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null) { - List otherInfos = otherSchemeMapper.getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() - .employeeId(param.getEmployeeId()) - .paymentOrganization(param.getPaymentOrganization()) - .build()); - baseInfoPO.setOtherArchivesId(otherInfos.get(0).getId()); - //对于非系统人员，编辑后状态切换为正在缴纳 - if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { - baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - } - getInsuranceBaseInfoMapper().updateById(baseInfoPO); - } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); - } + targetPO = baseInfoPO; + encryptUtil.decrypt(insertOtherInfo, InsuranceArchivesOtherSchemePO.class); + targetDetailPO = insertOtherInfo; + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); } - - //生成福利档案基数调整记录数据 - List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); - //福利档案基数调整记录数据入库 - batchInsertAdjustHistory(adjustHistoryList); - - } finally { - sqlSession.close(); } + //记录操作日志 + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-其他福利明细保存")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-其他福利明细保存") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setNewValues(targetDetailPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + //生成福利档案基数调整记录数据 + List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); + //福利档案基数调整记录数据入库 + batchInsertAdjustHistory(adjustHistoryList); + } /** @@ -2872,149 +3059,159 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService */ public void fundSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { long employeeId = user.getUID(); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); - InsuranceArchivesFundSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesFundSaveParam.class); - SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0,"员工id为空"), param, param.getEmployeeId()); + InsuranceArchivesFundSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesFundSaveParam.class); + SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0,"员工id为空"), param, param.getEmployeeId()); - if (org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) && !SalaryDateUtil.checkYearMonth(param.getFundStartTime())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "公积金起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); - } - if (org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) && !SalaryDateUtil.checkYearMonth(param.getFundEndTime())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "公积金最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); - } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) && !SalaryDateUtil.checkYearMonth(param.getFundStartTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "公积金起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) && !SalaryDateUtil.checkYearMonth(param.getFundEndTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "公积金最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + //创建操作日志记录对象 + InsuranceArchivesBaseInfoPO targetPO = new InsuranceArchivesBaseInfoPO(); + InsuranceArchivesFundSchemePO targetDetailPO = new InsuranceArchivesFundSchemePO(); - List fundIds = new ArrayList(); - fundIds.add(param.getId()); - List oldFundInfoList = fundSchemeMapper.getFundById(fundIds); + List fundIds = new ArrayList(); + fundIds.add(param.getId()); + List oldFundInfoList = getFundSchemeMapper().getFundById(fundIds); + //设置福利档案基数调整记录数据 + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(param.getFundSchemeId()) + .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + if (oldFundInfoList.size() == 1) { + InsuranceArchivesFundSchemePO oldFundInfo = oldFundInfoList.get(0); //设置福利档案基数调整记录数据 - InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() - .adjustAfterSchemeId(param.getFundSchemeId()) - .adjustAfterBaseJson(paramReq.getPaymentForm()) - .adjustAfterComBaseJson(paramReq.getPaymentComForm()) + encryptUtil.decrypt(oldFundInfo, InsuranceArchivesFundSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldFundInfo.getFundPaymentBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldFundInfo.getFundSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldFundInfo.getFundPaymentComBaseString()); + //新数据 + InsuranceArchivesFundSchemePO updateFundInfo = InsuranceArchivesFundSchemePO.builder() + .id(oldFundInfo.getId()) + .fundSchemeId(param.getFundSchemeId()) + .fundAccount(param.getFundAccount()) + .fundEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) ? param.getFundEndTime() : null) + .fundStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) ? param.getFundStartTime() : null) + .fundPaymentBaseString(paramReq.getPaymentForm()) + .supplementFundAccount(param.getSupplementFundAccount()) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .underTake(param.getUnderTake()) + .paymentOrganization(param.getPaymentOrganization()) + .updateTime(new Date()) .welfareType(paramReq.getWelfareType().getValue()) .employeeId(param.getEmployeeId()) - .paymentOrganization(param.getPaymentOrganization()) .build(); - - if (oldFundInfoList.size() == 1) { - InsuranceArchivesFundSchemePO oldFundInfo = oldFundInfoList.get(0); - //设置福利档案基数调整记录数据 - encryptUtil.decrypt(oldFundInfo, InsuranceArchivesFundSchemePO.class); - adjustInfo.setAdjustBeforeBaseJson(oldFundInfo.getFundPaymentBaseString()); - adjustInfo.setAdjustBeforeSchemeId(oldFundInfo.getFundSchemeId()); - adjustInfo.setAdjustBeforeComBaseJson(oldFundInfo.getFundPaymentComBaseString()); - //新数据 - InsuranceArchivesFundSchemePO updateFundInfo = InsuranceArchivesFundSchemePO.builder() - .id(oldFundInfo.getId()) - .fundSchemeId(param.getFundSchemeId()) - .fundAccount(param.getFundAccount()) - .fundEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) ? param.getFundEndTime() : null) - .fundStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) ? param.getFundStartTime() : null) - .fundPaymentBaseString(paramReq.getPaymentForm()) - .supplementFundAccount(param.getSupplementFundAccount()) - .creator(employeeId) - .nonPayment(param.getNonPayment()) - .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .underTake(param.getUnderTake()) - .paymentOrganization(param.getPaymentOrganization()) - .updateTime(new Date()) - .welfareType(paramReq.getWelfareType().getValue()) - .employeeId(param.getEmployeeId()) - .build(); - //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); } - //需要拆分个人和公司福利基数时 - if (welBaseDiffSign) { - updateFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); - //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(updateFundInfo.getFundSchemeId(),updateFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } + } + encryptUtil.encrypt(updateFundInfo, InsuranceArchivesFundSchemePO.class); + getFundSchemeMapper().updateById(updateFundInfo); + //更新base_info表状态 + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + //对于非系统人员，编辑后状态切换为正在缴纳 + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + baseInfoPO.setFundArchivesId(updateFundInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + + targetPO = baseInfoPO; + encryptUtil.decrypt(updateFundInfo, InsuranceArchivesFundSchemePO.class); + targetDetailPO = updateFundInfo; + } else { + getFundSchemeMapper().deleteByEmployeeIdAndPayOrg(InsuranceArchivesFundSchemePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + //新建社保档案，并关联主表 + InsuranceArchivesFundSchemePO insertFundInfo = InsuranceArchivesFundSchemePO.builder() + .fundSchemeId(param.getFundSchemeId()) + .fundAccount(param.getFundAccount()) + .fundEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) ? param.getFundEndTime() : null) + .fundStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) ? param.getFundStartTime() : null) + .fundPaymentBaseString(paramReq.getPaymentForm()) + .supplementFundAccount(param.getSupplementFundAccount()) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .underTake(param.getUnderTake()) + .paymentOrganization(param.getPaymentOrganization()) + .createTime(new Date()) + .updateTime(new Date()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .build(); + //校验福利基数是否符合上下限要求， + if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); } - encryptUtil.encrypt(updateFundInfo, InsuranceArchivesFundSchemePO.class); - fundSchemeMapper.updateById(updateFundInfo); - //更新base_info表状态 - InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { - //对于非系统人员，编辑后状态切换为正在缴纳 - baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - } - baseInfoPO.setFundArchivesId(updateFundInfo.getId()); - getInsuranceBaseInfoMapper().updateById(baseInfoPO); - sqlSession.commit(); - } else { - fundSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesFundSchemePO.builder() + } + encryptUtil.encrypt(insertFundInfo, InsuranceArchivesFundSchemePO.class); + getFundSchemeMapper().insert(insertFundInfo); + + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null) { + List fundInfos = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() .employeeId(param.getEmployeeId()) .paymentOrganization(param.getPaymentOrganization()) .build()); - //新建社保档案，并关联主表 - InsuranceArchivesFundSchemePO insertFundInfo = InsuranceArchivesFundSchemePO.builder() - .fundSchemeId(param.getFundSchemeId()) - .fundAccount(param.getFundAccount()) - .fundEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundEndTime()) ? param.getFundEndTime() : null) - .fundStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getFundStartTime()) ? param.getFundStartTime() : null) - .fundPaymentBaseString(paramReq.getPaymentForm()) - .supplementFundAccount(param.getSupplementFundAccount()) - .creator(employeeId) - .nonPayment(param.getNonPayment()) - .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .underTake(param.getUnderTake()) - .paymentOrganization(param.getPaymentOrganization()) - .createTime(new Date()) - .updateTime(new Date()) - .welfareType(paramReq.getWelfareType().getValue()) - .employeeId(param.getEmployeeId()) - .build(); - //校验福利基数是否符合上下限要求， - if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } - //需要拆分个人和公司福利基数时 - if (welBaseDiffSign) { - insertFundInfo.setFundPaymentComBaseString(paramReq.getPaymentComForm()); - //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(insertFundInfo.getFundSchemeId(),insertFundInfo.getFundPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } - } - encryptUtil.encrypt(insertFundInfo, InsuranceArchivesFundSchemePO.class); - fundSchemeMapper.insert(insertFundInfo); - sqlSession.commit(); - - InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null) { - List fundInfos = fundSchemeMapper.getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() - .employeeId(param.getEmployeeId()) - .paymentOrganization(param.getPaymentOrganization()) - .build()); - baseInfoPO.setFundArchivesId(fundInfos.get(0).getId()); - //对于非系统人员，编辑后状态切换为正在缴纳 - if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { - baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - } - getInsuranceBaseInfoMapper().updateById(baseInfoPO); - } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); + baseInfoPO.setFundArchivesId(fundInfos.get(0).getId()); + //对于非系统人员，编辑后状态切换为正在缴纳 + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); } + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + targetPO = baseInfoPO; + encryptUtil.decrypt(insertFundInfo, InsuranceArchivesFundSchemePO.class); + targetDetailPO = insertFundInfo; + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); } - - //生成福利档案基数调整记录数据 - List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); - //福利档案基数调整记录数据入库 - batchInsertAdjustHistory(adjustHistoryList); - - } finally { - sqlSession.close(); } - + //记录操作日志 + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-公积金明细保存")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-公积金明细保存") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setNewValues(targetDetailPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + //生成福利档案基数调整记录数据 + List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); + //福利档案基数调整记录数据入库 + batchInsertAdjustHistory(adjustHistoryList); } /** @@ -3023,154 +3220,164 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService */ public void socialSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { long employeeId = user.getUID(); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + InsuranceArchivesSocialSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesSocialSaveParam.class); + SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0,"员工id为空"), param, param.getEmployeeId()); - InsuranceArchivesSocialSaveParam param = JSONObject.parseObject(paramReq.getBaseForm(), InsuranceArchivesSocialSaveParam.class); - SalaryAssert.notNull(SalaryI18nUtil.getI18nLabel(0,"员工id为空"), param, param.getEmployeeId()); - - if (org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) && !SalaryDateUtil.checkYearMonth(param.getSocialStartTime())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "社保起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); - } - if (org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) && !SalaryDateUtil.checkYearMonth(param.getSocialEndTime())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "社保最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); - } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) && !SalaryDateUtil.checkYearMonth(param.getSocialStartTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "社保起始缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) && !SalaryDateUtil.checkYearMonth(param.getSocialEndTime())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "社保最后缴纳时间格式错误,正确格式为YYYY-MM或者yyyy-MM-dd")); + } // //删除社保数据 // socialSchemeMapper.batchDeleteByEmployeeIds(Collections.singletonList(param.getEmployeeId())); - //查询已有数据 - List socialIds = new ArrayList(); - socialIds.add(param.getId()); - List oldSocialInfoList = socialSchemeMapper.getSocialById(socialIds); - + //创建操作日志记录对象 + InsuranceArchivesBaseInfoPO targetPO = new InsuranceArchivesBaseInfoPO(); + InsuranceArchivesSocialSchemePO targetDetailPO = new InsuranceArchivesSocialSchemePO(); + //查询已有数据 + List socialIds = new ArrayList(); + socialIds.add(param.getId()); + List oldSocialInfoList = getSocialSchemeMapper().getSocialById(socialIds); + //设置福利档案基数调整记录数据 + InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() + .adjustAfterSchemeId(param.getSocialSchemeId()) + .adjustAfterBaseJson(paramReq.getPaymentForm()) + .adjustAfterComBaseJson(paramReq.getPaymentComForm()) + .welfareType(paramReq.getWelfareType().getValue()) + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + //组装新数据 + if (oldSocialInfoList.size() == 1) { + //老数据 + InsuranceArchivesSocialSchemePO oldSocialInfo = oldSocialInfoList.get(0); //设置福利档案基数调整记录数据 - InsuranceArchivesBaseHistoryDTO adjustInfo = InsuranceArchivesBaseHistoryDTO.builder() - .adjustAfterSchemeId(param.getSocialSchemeId()) - .adjustAfterBaseJson(paramReq.getPaymentForm()) - .adjustAfterComBaseJson(paramReq.getPaymentComForm()) - .welfareType(paramReq.getWelfareType().getValue()) - .employeeId(param.getEmployeeId()) - .paymentOrganization(param.getPaymentOrganization()) - .build(); - - //组装新数据 - if (oldSocialInfoList.size() == 1) { - //老数据 - InsuranceArchivesSocialSchemePO oldSocialInfo = oldSocialInfoList.get(0); - //设置福利档案基数调整记录数据 - encryptUtil.decrypt(oldSocialInfo, InsuranceArchivesSocialSchemePO.class); - adjustInfo.setAdjustBeforeBaseJson(oldSocialInfo.getSocialPaymentBaseString()); - adjustInfo.setAdjustBeforeSchemeId(oldSocialInfo.getSocialSchemeId()); - adjustInfo.setAdjustBeforeComBaseJson(oldSocialInfo.getSocialPaymentComBaseString()); - //新数据 - InsuranceArchivesSocialSchemePO updateSocialInfo = - InsuranceArchivesSocialSchemePO.builder() - .id(oldSocialInfo.getId()) - .welfareType(paramReq.getWelfareType().getValue()) - .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .socialPaymentBaseString(paramReq.getPaymentForm()) - .socialSchemeId(param.getSocialSchemeId()) - .socialEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) ? param.getSocialEndTime() : null) - .socialStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) ? param.getSocialStartTime() : null) - .creator(employeeId) - .nonPayment(param.getNonPayment()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .employeeId(param.getEmployeeId()) - .updateTime(new Date()) - .underTake(param.getUnderTake()) - .socialAccount(param.getSchemeAccount()) - .paymentOrganization(param.getPaymentOrganization()) - .build(); + encryptUtil.decrypt(oldSocialInfo, InsuranceArchivesSocialSchemePO.class); + adjustInfo.setAdjustBeforeBaseJson(oldSocialInfo.getSocialPaymentBaseString()); + adjustInfo.setAdjustBeforeSchemeId(oldSocialInfo.getSocialSchemeId()); + adjustInfo.setAdjustBeforeComBaseJson(oldSocialInfo.getSocialPaymentComBaseString()); + //新数据 + InsuranceArchivesSocialSchemePO updateSocialInfo = + InsuranceArchivesSocialSchemePO.builder() + .id(oldSocialInfo.getId()) + .welfareType(paramReq.getWelfareType().getValue()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .socialPaymentBaseString(paramReq.getPaymentForm()) + .socialSchemeId(param.getSocialSchemeId()) + .socialEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) ? param.getSocialEndTime() : null) + .socialStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) ? param.getSocialStartTime() : null) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .employeeId(param.getEmployeeId()) + .updateTime(new Date()) + .underTake(param.getUnderTake()) + .socialAccount(param.getSchemeAccount()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + updateSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); } - //需要拆分个人和公司福利基数时 - if (welBaseDiffSign) { - updateSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); - //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(updateSocialInfo.getSocialSchemeId(),updateSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } + } + encryptUtil.encrypt(updateSocialInfo, InsuranceArchivesSocialSchemePO.class); + getSocialSchemeMapper().updateById(updateSocialInfo); + //更新base_info表状态 + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + //对于非系统人员，编辑后状态切换为正在缴纳 + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); + } + baseInfoPO.setSocialArchivesId(updateSocialInfo.getId()); + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + + targetPO = baseInfoPO; + encryptUtil.decrypt(updateSocialInfo, InsuranceArchivesSocialSchemePO.class); + targetDetailPO = updateSocialInfo; + } else { + getSocialSchemeMapper().deleteByEmployeeIdAndPayOrg(InsuranceArchivesSocialSchemePO.builder() + .employeeId(param.getEmployeeId()) + .paymentOrganization(param.getPaymentOrganization()) + .build()); + //新建社保档案，并关联主表 + InsuranceArchivesSocialSchemePO insertSocialInfo = + InsuranceArchivesSocialSchemePO.builder() + .welfareType(paramReq.getWelfareType().getValue()) + .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .socialPaymentBaseString(paramReq.getPaymentForm()) + .socialSchemeId(param.getSocialSchemeId()) + .socialEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) ? param.getSocialEndTime() : null) + .socialStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) ? param.getSocialStartTime() : null) + .creator(employeeId) + .nonPayment(param.getNonPayment()) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .employeeId(param.getEmployeeId()) + .createTime(new Date()) + .updateTime(new Date()) + .underTake(param.getUnderTake()) + .socialAccount(param.getSchemeAccount()) + .paymentOrganization(param.getPaymentOrganization()) + .build(); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); + } + //需要拆分个人和公司福利基数时 + if (welBaseDiffSign) { + insertSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); + //校验福利基数是否符合上下限要求 + if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); } - encryptUtil.encrypt(updateSocialInfo, InsuranceArchivesSocialSchemePO.class); - socialSchemeMapper.updateById(updateSocialInfo); - //更新base_info表状态 - InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { - //对于非系统人员，编辑后状态切换为正在缴纳 - baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - } - baseInfoPO.setSocialArchivesId(updateSocialInfo.getId()); - getInsuranceBaseInfoMapper().updateById(baseInfoPO); - sqlSession.commit(); - } else { - socialSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesSocialSchemePO.builder() + } + encryptUtil.encrypt(insertSocialInfo, InsuranceArchivesSocialSchemePO.class); + getSocialSchemeMapper().insert(insertSocialInfo); + + InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); + if(baseInfoPO != null) { + List socialInfos = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() .employeeId(param.getEmployeeId()) .paymentOrganization(param.getPaymentOrganization()) .build()); - //新建社保档案，并关联主表 - InsuranceArchivesSocialSchemePO insertSocialInfo = - InsuranceArchivesSocialSchemePO.builder() - .welfareType(paramReq.getWelfareType().getValue()) - .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) - .socialPaymentBaseString(paramReq.getPaymentForm()) - .socialSchemeId(param.getSocialSchemeId()) - .socialEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialEndTime()) ? param.getSocialEndTime() : null) - .socialStartTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getSocialStartTime()) ? param.getSocialStartTime() : null) - .creator(employeeId) - .nonPayment(param.getNonPayment()) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .employeeId(param.getEmployeeId()) - .createTime(new Date()) - .updateTime(new Date()) - .underTake(param.getUnderTake()) - .socialAccount(param.getSchemeAccount()) - .paymentOrganization(param.getPaymentOrganization()) - .build(); - //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentBaseString(), PaymentScopeEnum.SCOPE_PERSON.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } - //需要拆分个人和公司福利基数时 - if (welBaseDiffSign) { - insertSocialInfo.setSocialPaymentComBaseString(paramReq.getPaymentComForm()); - //校验福利基数是否符合上下限要求 - if (!checkWelBaseLimit(insertSocialInfo.getSocialSchemeId(),insertSocialInfo.getSocialPaymentComBaseString(), PaymentScopeEnum.SCOPE_COMPANY.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保福利明细中的基数更新内容不符合相关基数上下限要求，请检查后重试！")); - } - } - encryptUtil.encrypt(insertSocialInfo, InsuranceArchivesSocialSchemePO.class); - socialSchemeMapper.insert(insertSocialInfo); - sqlSession.commit(); - - InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId()); - if(baseInfoPO != null) { - List socialInfos = socialSchemeMapper.getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() - .employeeId(param.getEmployeeId()) - .paymentOrganization(param.getPaymentOrganization()) - .build()); - baseInfoPO.setSocialArchivesId(socialInfos.get(0).getId()); - //对于非系统人员，编辑后状态切换为正在缴纳 - if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { - baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); - } - getInsuranceBaseInfoMapper().updateById(baseInfoPO); - } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); + baseInfoPO.setSocialArchivesId(socialInfos.get(0).getId()); + //对于非系统人员，编辑后状态切换为正在缴纳 + if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) { + baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue()); } + getInsuranceBaseInfoMapper().updateById(baseInfoPO); + targetPO = baseInfoPO; + encryptUtil.decrypt(insertSocialInfo, InsuranceArchivesSocialSchemePO.class); + targetDetailPO = insertSocialInfo; + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "档案不存在！")); } - - //生成福利档案基数调整记录数据 - List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); - //福利档案基数调整记录数据入库 - batchInsertAdjustHistory(adjustHistoryList); - } finally { - sqlSession.close(); } + //记录操作日志 + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-社保明细保存")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-社保明细保存") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setNewValues(targetDetailPO); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + //生成福利档案基数调整记录数据 + List adjustHistoryList = createAdjustInfo(adjustInfo, employeeId); + //福利档案基数调整记录数据入库 + batchInsertAdjustHistory(adjustHistoryList); } /** diff --git a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java index 11b7cf378..453ff9729 100644 --- a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java @@ -6,6 +6,8 @@ import com.api.browser.util.ConditionFactory; import com.api.browser.util.ConditionType; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; import com.engine.salary.entity.sicategory.bo.ICategoryBO; @@ -15,6 +17,7 @@ import com.engine.salary.entity.sicategory.dto.ICategoryListDTO; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.sicategory.DataTypeEnum; import com.engine.salary.enums.sicategory.IsPaymentEnum; import com.engine.salary.enums.sicategory.PaymentScopeEnum; @@ -119,6 +122,15 @@ public class SICategoryServiceImpl extends Service implements SICategoryService items.put("paymentScope",checkbox); apidatas.put("item",items); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(form.getId())); + loggerContext.setTargetName(form.getInsuranceName()); + loggerContext.setOperateType(OperateTypeEnum.READ.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看自定义福利明细")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看自定义福利明细") + ": " + form.getInsuranceName()); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); return apidatas; } @@ -250,6 +262,16 @@ public class SICategoryServiceImpl extends Service implements SICategoryService .updateTime(new Date()) .build(); getICategoryMapper().updateNameAndPayScopeById(iCategoryPO); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(iCategoryPO.getId())); + loggerContext.setTargetName(iCategoryPO.getInsuranceName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "更新自定义福利信息")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更新自定义福利信息")); + loggerContext.setNewValues(iCategoryPO); + SalaryElogConfig.siCategoryLoggerTemplate.write(loggerContext); return null; } @@ -297,6 +319,16 @@ public class SICategoryServiceImpl extends Service implements SICategoryService //删除自定义福利项 categoryPO.setUpdateTime(new Date()); getICategoryMapper().deleteCustomCategoryById(categoryPO); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(categoryPO.getId())); + loggerContext.setTargetName(categoryPO.getInsuranceName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建自定义福利项")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建自定义福利项")); +// loggerContext.setNewValues(categoryPO); + SalaryElogConfig.siCategoryLoggerTemplate.write(loggerContext); return null; } @@ -381,22 +413,23 @@ public class SICategoryServiceImpl extends Service implements SICategoryService * @param employeeId DataTypeEnum.SYSTEM.getValue() */ public void save(ICategoryFormDTO iCategoryFormDTO, long employeeId) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); - iCategoryFormDTO.setInsuranceName(StringUtils.trim(iCategoryFormDTO.getInsuranceName())); - List iCategoryPOS = listByName(iCategoryFormDTO.getInsuranceName()); - if (CollectionUtils.isNotEmpty(iCategoryPOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利名称不允许重复")); - } - ICategoryPO iCategoryPO = ICategoryBO.convertToInsuranceCategoryPO(iCategoryFormDTO, employeeId); - iCategoryMapper.insert(iCategoryPO); - - sqlSession.commit(); - - } finally { - sqlSession.close(); + iCategoryFormDTO.setInsuranceName(StringUtils.trim(iCategoryFormDTO.getInsuranceName())); + List iCategoryPOS = listByName(iCategoryFormDTO.getInsuranceName()); + if (CollectionUtils.isNotEmpty(iCategoryPOS)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利名称不允许重复")); } + ICategoryPO iCategoryPO = ICategoryBO.convertToInsuranceCategoryPO(iCategoryFormDTO, employeeId); + getICategoryMapper().insert(iCategoryPO); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(iCategoryPO.getId())); + loggerContext.setTargetName(iCategoryPO.getInsuranceName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建自定义福利项")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建自定义福利项")); + loggerContext.setNewValues(iCategoryPO); + SalaryElogConfig.siCategoryLoggerTemplate.write(loggerContext); } /** @@ -436,31 +469,34 @@ public class SICategoryServiceImpl extends Service implements SICategoryService * @param isUse */ public void updateStatusById(Long id, Integer isUse) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - if(id == null) { - throw new SalaryRunTimeException("id is required"); - } - if (isUse == null) { - throw new SalaryRunTimeException("isUse is required"); - } -// List insuranceSchemeDetailPOS = new SISchemeBiz().queryListByInsuranceIdIsPayment(id, IsPaymentEnum.YES.getValue()); - List insuranceSchemeDetailPOS = getSISchemeService(user).queryListByInsuranceIdIsPayment(id, IsPaymentEnum.YES.getValue()); - if(CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS) && isUse == 0) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该福利开启缴费，不可删除(或停用)")); - } - ICategoryPO iCategoryPO = getICategoryPOByID(id); - if (Objects.isNull(iCategoryPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"数据记录不存在")); - } - iCategoryPO.setIsUse(isUse); - ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); - iCategoryMapper.updateById(iCategoryPO); - sqlSession.commit(); - }finally { - sqlSession.close(); + if(id == null) { + throw new SalaryRunTimeException("id is required"); } + if (isUse == null) { + throw new SalaryRunTimeException("isUse is required"); + } +// List insuranceSchemeDetailPOS = new SISchemeBiz().queryListByInsuranceIdIsPayment(id, IsPaymentEnum.YES.getValue()); + List insuranceSchemeDetailPOS = getSISchemeService(user).queryListByInsuranceIdIsPayment(id, IsPaymentEnum.YES.getValue()); + if(CollectionUtils.isNotEmpty(insuranceSchemeDetailPOS) && isUse == 0) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该福利开启缴费，不可删除(或停用)")); + } + ICategoryPO iCategoryPO = getICategoryPOByID(id); + if (Objects.isNull(iCategoryPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"数据记录不存在")); + } + iCategoryPO.setIsUse(isUse); + getICategoryMapper().updateById(iCategoryPO); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(iCategoryPO.getId())); + loggerContext.setTargetName(iCategoryPO.getInsuranceName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "更新自定义福利状态")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更新自定义福利状态")); + loggerContext.setNewValues(iCategoryPO); + SalaryElogConfig.siCategoryLoggerTemplate.write(loggerContext); } /*****以上代码为SICategoryBiz中方法逻辑迁移，旨在减少Biz类的使用*****/ diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 22e584b4f..3c7db3426 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -14,6 +14,7 @@ import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseHistoryDTO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.SIArchiveImportParam; import com.engine.salary.entity.siarchives.po.*; @@ -40,6 +41,7 @@ import com.engine.salary.enums.salarysob.TargetTypeEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.sicategory.*; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.datacollection.EmployMapper; import com.engine.salary.mapper.siaccount.SIAccountUtilMapper; import com.engine.salary.mapper.siarchives.FundSchemeMapper; import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; @@ -173,6 +175,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { return SqlProxyHandle.getProxy(SIAccountUtilMapper.class); } + private EmployMapper getEmployMapper() { + return MapperProxyFactory.getProxy(EmployMapper.class); + } @Override public Map getForm(Map params) { // return commandExecutor.execute(new SISchemeGetFormCmd(params, user)); @@ -186,6 +191,16 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { // InsuranceSchemeFormVO form = siSchemeBiz.getForm(id, welfareTypeEnum); InsuranceSchemeFormVO form = getForm(id, welfareTypeEnum); apidatas.put("form",form); + //记录操作日志 + InsuranceSchemeDTO schemeBatch = form.getSchemeBatch(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(schemeBatch.getId())); + loggerContext.setTargetName(schemeBatch.getSchemeName()); + loggerContext.setOperateType(OperateTypeEnum.READ.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看福利方案明细")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看福利方案明细") + ": " + schemeBatch.getSchemeName()); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); return apidatas; } @@ -623,6 +638,13 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } rows.add(row); } + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setOperateType(OperateTypeEnum.EXPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案导出")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案导出")); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); //获取excel return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } @@ -1821,10 +1843,17 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } public void handleImportData(List insuranceArchivesAccountPOS, SIArchiveImportParam param) { + List baseInfoPOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getBaseInfo).collect(Collectors.toList()); + //去除员工id+个税扣缴义务人下重复的数据 + baseInfoPOS = baseInfoPOS.stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); + //老数据map + Map oldSocialArchiveMap = getSocialArchiveMap(baseInfoPOS); + Map oldFundArchiveMap = getFundArchiveMap(baseInfoPOS); + Map oldOtherArchiveMap = getOtherArchiveMap(baseInfoPOS); //导入社保档案 List socialSchemePOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getSocial).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(socialSchemePOS)) { - //去除员工id+个税扣缴义务人下重复的数据 socialSchemePOS = socialSchemePOS.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); @@ -1848,7 +1877,6 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //导入公积金档案 List fundSchemePOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getFund).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(fundSchemePOS)) { - //去除员工id+个税扣缴义务人下重复的数据 fundSchemePOS = fundSchemePOS.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); @@ -1869,7 +1897,6 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //导入其他福利档案 List otherSchemePOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getOther).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(otherSchemePOS)) { - //去除员工id+个税扣缴义务人下重复的数据 otherSchemePOS = otherSchemePOS.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); @@ -1889,12 +1916,12 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { getSIArchivesService(user).batchInsertAdjustHistory(adjustOtherHistoryPOList); } //导入福利档案基础信息 - List baseInfoPOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getBaseInfo).collect(Collectors.toList()); +// List baseInfoPOS = insuranceArchivesAccountPOS.stream().filter(Objects::nonNull).map(InsuranceArchivesAccountPO::getBaseInfo).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(baseInfoPOS)) { // baseInfoPOS = baseInfoPOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(InsuranceArchivesBaseInfoPO::getEmployeeId))), ArrayList::new)); - //去除员工id+个税扣缴义务人下重复的数据 - baseInfoPOS = baseInfoPOS.stream() - .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); +// //去除员工id+个税扣缴义务人下重复的数据 +// baseInfoPOS = baseInfoPOS.stream() +// .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(f -> f.getPaymentOrganization() + "-" + f.getEmployeeId()))), ArrayList::new)); //根据人员id和个税扣缴义务人id删除对应档案 baseInfoPOS.forEach(getInsuranceBaseInfoMapper()::deleteByEmployeeIdAndPayOrg); //分批批量删除 @@ -1919,6 +1946,54 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //分批批量入库 List> partition = Lists.partition(newInsuranceArchivesBaseInfoList, 100); partition.forEach(getInsuranceBaseInfoMapper()::batchSave); + //记录操作日志 + //获取新数据map和老数据map + Map newSocialArchiveMap = getSocialArchiveMap(baseInfoPOS); + Map newFundArchiveMap = getFundArchiveMap(baseInfoPOS); + Map newOtherArchiveMap = getOtherArchiveMap(baseInfoPOS); + newInsuranceArchivesBaseInfoList.forEach(targetPO -> { + InsuranceArchivesSocialSchemePO targetSocialDetail = newSocialArchiveMap.get(targetPO.getPaymentOrganization() + "-" + targetPO.getEmployeeId()); + InsuranceArchivesFundSchemePO targetFundDetail = newFundArchiveMap.get(targetPO.getPaymentOrganization() + "-" + targetPO.getEmployeeId()); + InsuranceArchivesOtherSchemePO targetOtherDetail = newOtherArchiveMap.get(targetPO.getPaymentOrganization() + "-" + targetPO.getEmployeeId()); + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetPO.getEmployeeId()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + if (targetSocialDetail != null) { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-社保明细导入")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-社保明细导入") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOldValues(oldSocialArchiveMap.get(targetPO.getPaymentOrganization() + "-" + targetPO.getEmployeeId())); + loggerContext.setNewValues(targetSocialDetail); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + } + if (targetFundDetail != null) { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-公积金明细导入")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-公积金明细导入") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOldValues(oldFundArchiveMap.get(targetPO.getPaymentOrganization() + "-" + targetPO.getEmployeeId())); + loggerContext.setNewValues(targetFundDetail); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + } + if (targetOtherDetail != null) { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-其他福利明细导入")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-其他福利明细导入") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + loggerContext.setOldValues(oldOtherArchiveMap.get(targetPO.getPaymentOrganization() + "-" + targetPO.getEmployeeId())); + loggerContext.setNewValues(targetOtherDetail); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); + } + }); } //新增人员范围（会自动生成人员档案） if (CollectionUtils.isNotEmpty(param.getTaxAgentRanges())) { @@ -1926,6 +2001,61 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } } + private Map getSocialArchiveMap(List baseInfoPOS) { + Map map = new HashMap<>(); + if (baseInfoPOS.size() > 0) { + //遍历待更新的福利档案数据，对每组档案生成基数调整记录（基数单元未变化则忽略） + for (InsuranceArchivesBaseInfoPO po : baseInfoPOS) { + List archiveList = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .paymentOrganization(po.getPaymentOrganization()).employeeId(po.getEmployeeId()).build()); + if (archiveList.size() == 1) { + //新增调整记录，变更 + encryptUtil.decryptList(archiveList, InsuranceArchivesSocialSchemePO.class); + map.put(po.getPaymentOrganization() + "-" + po.getEmployeeId(), archiveList.get(0)); + } else if (archiveList.size() > 1) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保档案存在冗余数据！")); + } + } + } + return map; + } + private Map getFundArchiveMap(List baseInfoPOS) { + Map map = new HashMap<>(); + if (baseInfoPOS.size() > 0) { + //遍历待更新的福利档案数据，对每组档案生成基数调整记录（基数单元未变化则忽略） + for (InsuranceArchivesBaseInfoPO po : baseInfoPOS) { + List archiveList = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .paymentOrganization(po.getPaymentOrganization()).employeeId(po.getEmployeeId()).build()); + if (archiveList.size() == 1) { + //新增调整记录，变更 + encryptUtil.decryptList(archiveList, InsuranceArchivesFundSchemePO.class); + map.put(po.getPaymentOrganization() + "-" + po.getEmployeeId(), archiveList.get(0)); + } else if (archiveList.size() > 1) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"公积金档案存在冗余数据！")); + } + } + } + return map; + } + private Map getOtherArchiveMap(List baseInfoPOS) { + Map map = new HashMap<>(); + if (baseInfoPOS.size() > 0) { + //遍历待更新的福利档案数据，对每组档案生成基数调整记录（基数单元未变化则忽略） + for (InsuranceArchivesBaseInfoPO po : baseInfoPOS) { + List archiveList = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .paymentOrganization(po.getPaymentOrganization()).employeeId(po.getEmployeeId()).build()); + if (archiveList.size() == 1) { + //新增调整记录，变更 + encryptUtil.decryptList(archiveList, InsuranceArchivesOtherSchemePO.class); + map.put(po.getPaymentOrganization() + "-" + po.getEmployeeId(), archiveList.get(0)); + } else if (archiveList.size() > 1) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"社保档案存在冗余数据！")); + } + } + } + return map; + } + /** * 导出档案导入所需要的模板，可根据开关选择是否导出现有的档案数据 @@ -2335,8 +2465,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(targetPO.getSchemeName()); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建福利方案")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建福利方案") + ": " + targetPO.getSchemeName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增福利方案主表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案基础信息") + ": " + targetPO.getSchemeName()); loggerContext.setNewValues(targetPO); SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); } @@ -2345,26 +2475,19 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //加密入库 encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); insuranceSchemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::insert); - //记录操作日志 + //记录明细表操作日志 if (insuranceSchemeDetailPOS.size() > 0) { encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - List allCategoryList = getICategoryMapper().listAll(); - Map categoryNameMap = SalaryEntityUtil.convert2Map(allCategoryList, ICategoryPO::getId, ICategoryPO::getInsuranceName); - InsuranceSchemePO finalTargetPO = targetPO; - insuranceSchemeDetailPOS.forEach(schemeDetailPO -> { - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(String.valueOf(finalTargetPO.getId())); - loggerContext.setTargetName(categoryNameMap.get(schemeDetailPO.getInsuranceId())); - loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建福利方案明细")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建福利方案明细") + ": " - + categoryNameMap.get(schemeDetailPO.getInsuranceId()) - + "-" + SalaryEnumUtil.enumMatchByValue(schemeDetailPO.getPaymentScope(), PaymentScopeEnum.values(), PaymentScopeEnum.class)); - loggerContext.setNewValues(schemeDetailPO); - SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); - }); + LoggerContext> loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(targetPO.getSchemeName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增福利方案明细表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案明细")); + insuranceSchemeDetailPOS.forEach(loggerContext::setNewValues); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); } } @@ -2397,32 +2520,37 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"方案可见性为私有时，未设置可见范围")); } } - //记录操作日志 - LoggerContext loggerContext = new LoggerContext<>(); + //记录主表操作日志 + LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); loggerContext.setTargetId(insuranceSchemePO.getId().toString()); loggerContext.setTargetName(insuranceSchemePO.getSchemeName()); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利方案保存")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案保存") + ": " + insuranceSchemePO.getSchemeName()); - loggerContext.setOldValues(insuranceSchemePO); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "修改福利方案主表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案基础信息") + ": " + insuranceSchemePO.getSchemeName()); +// loggerContext.setOldValues(insuranceSchemePO); //更新福利方案主表 InsuranceSchemePO insuranceSchemePO1 = InsuranceSchemeBO.buildInsuranceSchemePO(insuranceSchemePO, updateParam.getInsuranceScheme()); getInsuranceSchemeMapper().update(insuranceSchemePO1); - //记录操作日志 + //记录主表操作日志 loggerContext.setNewValues(insuranceSchemePO1); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); - List oldInsuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(updateParam.getInsuranceScheme().getId()); - encryptUtil.decryptList(oldInsuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - //更新福利方案明细表 先删后插 getInsuranceSchemeDetailMapper().batchDeleteByPrimaryIds(Collections.singleton(updateParam.getInsuranceScheme().getId())); //更新明细表 List insuranceSchemeDetailPOS = InsuranceSchemeBO.convertToInsuranceSchemeDetailPoList(updateParam.getInsuranceSchemeDetailList(), employeeId, insuranceSchemePO.getId()); encryptUtil.encryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); insuranceSchemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::insert); - //记录操作日志, todo - + //记录明细表操作日志 + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + LoggerContext> insuranceSchemeDetailContext = new LoggerContext<>(); + insuranceSchemeDetailContext.setTargetId(String.valueOf(insuranceSchemePO.getId())); + insuranceSchemeDetailContext.setTargetName(insuranceSchemePO.getSchemeName()); + insuranceSchemeDetailContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + insuranceSchemeDetailContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "修改福利方案明细表")); + insuranceSchemeDetailContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案明细")); + insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailContext::setNewValues); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(insuranceSchemeDetailContext); } @@ -2451,38 +2579,33 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { getInsuranceSchemeDetailMapper().deleteByIds(schemeIds); //记录操作日志 + Map> targetDetailMap = targetDetailPoList.stream() + .collect(Collectors.groupingBy(InsuranceSchemeDetailPO::getPrimaryId)); if (targetPoList.size() > 0) { targetPoList.forEach(targetPO -> { + //记录主表操作日志 LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(targetPO.getSchemeName()); loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利方案")); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利方案主表")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利方案") + ": " + targetPO.getSchemeName()); loggerContext.setNewValues(targetPO); SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); - }); - } - if (targetDetailPoList.size() > 0) { - List allCategoryList = getICategoryMapper().listAll(); - Map categoryNameMap = SalaryEntityUtil.convert2Map(allCategoryList, ICategoryPO::getId, ICategoryPO::getInsuranceName); - Map> targetDetailMap = targetDetailPoList.stream() - .collect(Collectors.groupingBy(InsuranceSchemeDetailPO::getPrimaryId)); - targetDetailMap.forEach((k, v) -> { - v.forEach(schemeDetailPO -> { - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(String.valueOf(k)); - loggerContext.setTargetName(categoryNameMap.get(schemeDetailPO.getInsuranceId())); - loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利方案明细")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除福利方案明细") + ": " - + categoryNameMap.get(schemeDetailPO.getInsuranceId()) - + "-" + SalaryEnumUtil.enumMatchByValue(schemeDetailPO.getPaymentScope(), PaymentScopeEnum.values(), PaymentScopeEnum.class)); - loggerContext.setNewValues(schemeDetailPO); - SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); - }); + //记录明细表操作日志 + List targetDetails = targetDetailMap.get(targetPO.getId()); + if (targetDetails != null && targetDetails.size() > 0) { + LoggerContext> detailLoggerContext = new LoggerContext<>(); + detailLoggerContext.setUser(user); + detailLoggerContext.setTargetId(String.valueOf(targetPO.getId())); + detailLoggerContext.setTargetName(targetPO.getSchemeName()); + detailLoggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + detailLoggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除福利方案明细")); + detailLoggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案明细")); + targetDetails.forEach(detailLoggerContext::setNewValues); + SalaryElogConfig.siSchemeLoggerTemplate.write(detailLoggerContext); + } }); } @@ -2537,8 +2660,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(targetPO.getSchemeName()); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "复制福利方案")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "复制（新建）福利方案") + ": " + targetPO.getSchemeName()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "复制新增福利方案主表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案基础信息") + ": " + targetPO.getSchemeName()); loggerContext.setNewValues(targetPO); SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); } @@ -2569,26 +2692,19 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //加密入库 encryptUtil.encryptList(detailPOS, InsuranceSchemeDetailPO.class); detailPOS.forEach(getInsuranceSchemeDetailMapper()::insert); - //记录操作日志 + //记录明细表操作日志 if (detailPOS.size() > 0) { encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); - List allCategoryList = getICategoryMapper().listAll(); - Map categoryNameMap = SalaryEntityUtil.convert2Map(allCategoryList, ICategoryPO::getId, ICategoryPO::getInsuranceName); - InsuranceSchemePO finalTargetPO = targetPO; - detailPOS.forEach(schemeDetailPO -> { - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(String.valueOf(finalTargetPO.getId())); - loggerContext.setTargetName(categoryNameMap.get(schemeDetailPO.getInsuranceId())); - loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "复制福利方案明细")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "复制（新建）福利方案明细") + ": " - + categoryNameMap.get(schemeDetailPO.getInsuranceId()) - + "-" + SalaryEnumUtil.enumMatchByValue(schemeDetailPO.getPaymentScope(), PaymentScopeEnum.values(), PaymentScopeEnum.class)); - loggerContext.setNewValues(schemeDetailPO); - SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); - }); + LoggerContext> loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(targetPO.getSchemeName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "复制新增福利方案明细表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案明细")); + detailPOS.forEach(loggerContext::setNewValues); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); } } From 8f8bc5256d06407582b3c3174f311e909eca1475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sun, 18 Feb 2024 11:39:49 +0800 Subject: [PATCH 097/169] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/enums/OperateTypeEnum.java | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/com/engine/salary/enums/OperateTypeEnum.java b/src/com/engine/salary/enums/OperateTypeEnum.java index 697e1aea6..524a6f603 100644 --- a/src/com/engine/salary/enums/OperateTypeEnum.java +++ b/src/com/engine/salary/enums/OperateTypeEnum.java @@ -1,5 +1,8 @@ package com.engine.salary.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 操作类型 *

Copyright: Copyright (c) 2023

@@ -8,28 +11,40 @@ package com.engine.salary.enums; * @author qiantao * @version 1.0 **/ -public enum OperateTypeEnum { +@Getter +@AllArgsConstructor +public enum OperateTypeEnum implements BaseEnum{ - READ("0", "查看"), - ADD("1", "新增"), - UPDATE("2", "更新"), - DELETE("4", "删除"), - EXPORT("5", "导出"); + READ("0", "查看",1111), + ADD("1", "新建", 94607), + UPDATE("2", "更新", 249295), + DELETE("3", "删除", 87061), + FILE("4", "归档", 92144), + CANCEL_FILE("5", "取消归档", 145989), + CLEAR("6", "一键清空", 158473), + CALCULATE("7", "核算", 94146), + SYNC("8", "同步", 93950), + EXCEL_IMPORT("9", "导入", 87622), + EXCEL_EXPORT("9", "导出", 87622); - private String value; + private final String value; - private String label; + private final String defaultLabel; - OperateTypeEnum(String value, String label) { - this.value = value; - this.label = label; - } + private final Integer labelId; + @Override public String getValue() { return value; } - public String getLabel() { - return label; + @Override + public Integer getLabelId() { + return labelId; + } + + @Override + public String getDefaultLabel() { + return defaultLabel; } } From b2972e8acad74a9104308ee0cd2937fee67e77ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sun, 18 Feb 2024 11:40:59 +0800 Subject: [PATCH 098/169] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SISchemeServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 3c7db3426..ac0391195 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -13,8 +13,6 @@ import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.datacollection.DataCollectionEmployee; -import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; -import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseHistoryDTO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.SIArchiveImportParam; import com.engine.salary.entity.siarchives.po.*; @@ -59,6 +57,7 @@ import com.engine.salary.sys.enums.OpenEnum; 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; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; @@ -68,7 +67,6 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -641,7 +639,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { //记录操作日志 LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); - loggerContext.setOperateType(OperateTypeEnum.EXPORT.getValue()); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案导出")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案导出")); SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); From 7fe03ac7a111ae4573262b552444fd0107e0d7dc Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 19 Feb 2024 10:09:49 +0800 Subject: [PATCH 099/169] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=8F=8D=E9=A6=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java | 2 +- .../salary/service/impl/SalaryBillBaseSetServiceImpl.java | 2 +- src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 4 ++-- .../engine/salary/service/impl/SalaryTemplateServiceImpl.java | 2 +- src/com/engine/salary/wrapper/SalaryTemplateWrapper.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java index d436117c1..7f09f2048 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java @@ -78,7 +78,7 @@ public class SalaryTemplateBO { .autoSendDayOfMonth(saveParam.getAutoSendDayOfMonth()) .autoSendTimeOfDay(saveParam.getAutoSendTimeOfDay()) .ackFeedbackStatus(saveParam.getAckFeedbackStatus()?1:0) - .ackFeedbackStatus(saveParam.getFeedbackStatus()?1:0) + .feedbackStatus(saveParam.getFeedbackStatus()?1:0) .autoAckDays(saveParam.getAutoAckDays()) .feedbackUrl(saveParam.getFeedbackUrl()) .mobileFeedbackUrl(saveParam.getMobileFeedbackUrl()) diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java index 581b8f20d..63d0b5138 100644 --- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java @@ -97,7 +97,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB SalaryBillAckFeedbackDTO ackFeedbackSetting = saveParam.getAckFeedbackSetting(); // 1.保存确认反馈开关状态 getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK, "工资单确认状态", "billSend"); - getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend"); + getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedbackStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend"); if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) { // 保存自动确认时间 getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend"); diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index fb68130fb..a14d01c5c 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -866,10 +866,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService .replenishSalaryItemSetting(map.getOrDefault("replenishSalaryItemSetting", "").toString()) .build(); Object feedbackStatus = map.get("feedbackStatus"); - if (feedbackStatus == null) { + if (feedbackStatus == null || StringUtils.isBlank(feedbackStatus.toString())) { build.setFeedbackStatus(build.getAckFeedbackStatus()); } else { - Integer.valueOf(map.get("ackFeedbackStatus").toString()); + build.setFeedbackStatus(Integer.valueOf(feedbackStatus.toString())); } return build; } diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index 9243eced6..6e19ffbd2 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -215,7 +215,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate salaryTemplateNew.setAutoSendStatus(saveParam.getAutoSendStatus() ? 1 : 0); salaryTemplateNew.setAutoSendCycleType(saveParam.getAutoSendCycleType()); salaryTemplateNew.setAckFeedbackStatus(saveParam.getAckFeedbackStatus() ? 1 : 0); - salaryTemplateNew.setAckFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0); + salaryTemplateNew.setFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0); salaryTemplateNew.setAutoAckDays(saveParam.getAutoAckDays()); salaryTemplateNew.setFeedbackUrl(saveParam.getFeedbackUrl()); salaryTemplateNew.setMobileFeedbackUrl(saveParam.getMobileFeedbackUrl()); diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index c4b622c69..a1d36cdea 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -169,7 +169,7 @@ public class SalaryTemplateWrapper extends Service { if (po.getFeedbackStatus() == null) { salaryTemplateBaseSetDTO.setFeedbackStatus(salaryTemplateBaseSetDTO.getAckFeedbackStatus()); } else { - salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 0); + salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getFeedbackStatus(), 1) == 0); } salaryTemplateBaseSetDTO.setAutoAckDays(ObjectUtils.isEmpty(po.getAutoAckDays()) ? 7 : po.getAutoAckDays()); From 5525d9881cc78a52a3aa9a7932441d0def1730c1 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 19 Feb 2024 10:33:48 +0800 Subject: [PATCH 100/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=A6=8F=E5=88=A9=E9=A1=B9=E8=AF=A6=E6=83=85=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SICategoryBiz.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/engine/salary/biz/SICategoryBiz.java b/src/com/engine/salary/biz/SICategoryBiz.java index 6fb23037d..dec57358b 100644 --- a/src/com/engine/salary/biz/SICategoryBiz.java +++ b/src/com/engine/salary/biz/SICategoryBiz.java @@ -8,6 +8,7 @@ import com.engine.salary.enums.sicategory.IsPaymentEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.sicategory.ICategoryMapper; +import com.engine.salary.util.SalaryEnumUtil; import com.mzlion.core.utils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -41,6 +42,8 @@ public class SICategoryBiz { throw new SalaryRunTimeException("数据不存在"); } BeanUtils.copyProperties(iCategoryPO,iCategoryFormDTO); + iCategoryFormDTO.setWelfareType(SalaryEnumUtil.enumMatchByValue(iCategoryPO.getWelfareType(), WelfareTypeEnum.values(), WelfareTypeEnum.class)); + iCategoryFormDTO.setPaymentScope(SalaryEnumUtil.stringToEnums(iCategoryPO.getPaymentScope(), ",")); return iCategoryFormDTO; } From c64e9b4b7622fb32aa1a4829243c9cfe7a9a70ca Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 19 Feb 2024 14:01:30 +0800 Subject: [PATCH 101/169] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=8F=8D=E9=A6=88sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202402190103.sql | 3 +++ resource/sqlupgrade/GS/sql202402190103.sql | 3 +++ resource/sqlupgrade/JC/sql202402190103.sql | 3 +++ resource/sqlupgrade/Mysql/sql202402190103.sql | 1 + resource/sqlupgrade/Oracle/sql202402190103.sql | 2 ++ resource/sqlupgrade/PG/sql202402190103.sql | 1 + resource/sqlupgrade/SQLServer/sql202402190103.sql | 2 ++ resource/sqlupgrade/ST/sql202402190103.sql | 3 +++ src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 4 +++- 9 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 resource/sqlupgrade/DM/sql202402190103.sql create mode 100644 resource/sqlupgrade/GS/sql202402190103.sql create mode 100644 resource/sqlupgrade/JC/sql202402190103.sql create mode 100644 resource/sqlupgrade/Mysql/sql202402190103.sql create mode 100644 resource/sqlupgrade/Oracle/sql202402190103.sql create mode 100644 resource/sqlupgrade/PG/sql202402190103.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202402190103.sql create mode 100644 resource/sqlupgrade/ST/sql202402190103.sql diff --git a/resource/sqlupgrade/DM/sql202402190103.sql b/resource/sqlupgrade/DM/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/resource/sqlupgrade/GS/sql202402190103.sql b/resource/sqlupgrade/GS/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/resource/sqlupgrade/JC/sql202402190103.sql b/resource/sqlupgrade/JC/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202402190103.sql b/resource/sqlupgrade/Mysql/sql202402190103.sql new file mode 100644 index 000000000..e4806b3ec --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202402190103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_template add feedback_status int; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202402190103.sql b/resource/sqlupgrade/Oracle/sql202402190103.sql new file mode 100644 index 000000000..a45fcae76 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202402190103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_template add feedback_status int +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202402190103.sql b/resource/sqlupgrade/PG/sql202402190103.sql new file mode 100644 index 000000000..e4806b3ec --- /dev/null +++ b/resource/sqlupgrade/PG/sql202402190103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_template add feedback_status int; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202402190103.sql b/resource/sqlupgrade/SQLServer/sql202402190103.sql new file mode 100644 index 000000000..b00318264 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202402190103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_template add feedback_status int +go \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202402190103.sql b/resource/sqlupgrade/ST/sql202402190103.sql new file mode 100644 index 000000000..ee754d9b3 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202402190103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_template add feedback_status int; +/ + diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index a14d01c5c..67041985d 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -725,7 +725,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService throw new SalaryRunTimeException("请先设置工资单模板"); } Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus(); - if (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0) { + Integer feedbackStatus = salaryTemplates.get(0).getFeedbackStatus(); + if ( (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0) + || (feedbackStatus != null && NumberUtils.compare(feedbackStatus, 1) == 0)) { // 默认为空时，未读未确认 pageInfo.getList().stream().forEach(obj -> { SalarySendInfoListDTO dto = (SalarySendInfoListDTO) obj; From ee82d1cb9afb97ece6b1bf3d7e0929b77be628c2 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 19 Feb 2024 14:16:47 +0800 Subject: [PATCH 102/169] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=8F=8D=E9=A6=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/wrapper/SalarySendWrapper.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 75c83f012..e948c7b13 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -151,9 +151,15 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy Optional optional = salaryTemplates.stream().filter(s -> s.getSalarySobId().equals(e.getSalarySobId())).findFirst(); if (optional.isPresent()) { // todo 目前就一个回算，那么没有冻结且是回算，就展示补发名称 - e.setTemplate(NumberUtils.INTEGER_ONE.equals(e.getSalaryAcctType()) ? optional.get().getReplenishName() : optional.get().getName()); - e.setTemplateId(optional.get().getId()); - e.setAckFeedbackStatus(optional.get().getAckFeedbackStatus() == null ? 0 : optional.get().getAckFeedbackStatus()); + SalaryTemplatePO salaryTemplatePO = optional.get(); + e.setTemplate(NumberUtils.INTEGER_ONE.equals(e.getSalaryAcctType()) ? salaryTemplatePO.getReplenishName() : salaryTemplatePO.getName()); + e.setTemplateId(salaryTemplatePO.getId()); + if ((salaryTemplatePO.getAckFeedbackStatus() != null && salaryTemplatePO.getAckFeedbackStatus() == 1) || + (salaryTemplatePO.getFeedbackStatus() != null && salaryTemplatePO.getFeedbackStatus() == 1) ) { + e.setAckFeedbackStatus(1); + } else { + e.setAckFeedbackStatus(0); + } } }); } From cfb82cb9b20f037e082871c670357b4b9143848e Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 19 Feb 2024 17:27:42 +0800 Subject: [PATCH 103/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=E3=80=81=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E3=80=81=E5=8F=B0=E8=B4=A6=EF=BC=8C=E7=9B=B8=E5=85=B3=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E7=B1=BB=E4=BB=A3=E7=A0=81=E6=A2=B3=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4sqlsession=E5=BD=A2=E5=BC=8F=E7=9A=84mpper?= =?UTF-8?q?=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SIArchivesServiceImpl.java | 736 ++++++++---------- .../service/impl/SICategoryServiceImpl.java | 59 +- .../service/impl/SISchemeServiceImpl.java | 72 +- 3 files changed, 355 insertions(+), 512 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 5f317d94b..a8aaa54c5 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -140,6 +140,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class); } + private InsuranceSchemeMapper getInsuranceSchemeMapper() { + return MapperProxyFactory.getProxy(InsuranceSchemeMapper.class); + } + private SalaryEmployeeService getSalaryEmployeeService(User user) { return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); } @@ -160,6 +164,11 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService return MapperProxyFactory.getProxy(EmployMapper.class); } + private InsuranceBaseAdjustHistoryMapper getInsuranceBaseAdjustHistoryMapper() { + return MapperProxyFactory.getProxy(InsuranceBaseAdjustHistoryMapper.class); + } + + @Override public Map getTips(Map params) { return commandExecutor.execute(new SIArchivesTipsCmd(params, user)); @@ -813,12 +822,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public Map queryInsuranceTabTotal() { long currentEmployeeId = user.getUID(); - // tab页签数量 Map result = new HashMap<>(); - Boolean needAuth = getTaxAgentService(user).isNeedAuth(currentEmployeeId); - //获取管理的人员范围 List taxAgentEmployeeDTOS = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); Map> taxAgentEmployeesMap = SalaryEntityUtil.convert2Map(taxAgentEmployeeDTOS, TaxAgentManageRangeEmployeeDTO::getTaxAgentId, TaxAgentManageRangeEmployeeDTO::getEmployeeList); @@ -827,22 +833,18 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService // 获取作为管理员的所有个税扣缴义务人列表 Collection taxAgentPOS = getTaxAgentService(user).listAllTaxAgentsAsAdmin(currentEmployeeId); Set taxAgentIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId); - //获取所有福利档案基础信息 List archiveListDTOS = getInsuranceBaseInfoMapper().listAll(); list = archiveListDTOS.stream().filter(dto -> taxAgentIds.contains(dto.getPaymentOrganization())).collect(Collectors.toList()); - Boolean adminEnable = getTaxAgentService(user).isAdminEnable(currentEmployeeId); //不是管理员看不到数据，返回空 if (!adminEnable) { list = new ArrayList<>(); } - } else { list = getInsuranceBaseInfoMapper().listAll(); } - long stayAddTotal = 0L; long payTotal = 0L; long stayDelTotal = 0L; @@ -915,11 +917,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService List oldStayAddList = pos.stream().filter(f -> f.getRunStatus().equals(EmployeeStatusEnum.STOP_PAYMENT_FROM_ADD.getValue())).collect(Collectors.toList()); boolean isNotExist = oldStayAddList.stream().anyMatch(te -> taxAgentManageRangeEmployees.stream().noneMatch(p -> p.getEmployeeId() != null && p.getEmployeeId().equals(te.getEmployeeId()) && p.getTaxAgentId().equals(te.getPaymentOrganization()))); - if (isNotExist) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(116196, "不在当前个税扣缴义人的人员范围中，不可取消停缴")); } - for(InsuranceArchivesBaseInfoPO po : pos) { if (po.getRunStatus().equals(EmployeeStatusEnum.STOP_PAYMENT_FROM_ADD.getValue())) { //来自待增员的停缴->待增员 @@ -969,12 +969,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); } List baseInfoPOList = getInsuranceBaseInfoMapper().listByIds(ids); - //分别新建福利档案基础信息相关的社保、公积金、其他福利档案列表 List socialList = new ArrayList<>(); List fundList = new ArrayList<>(); List otherList = new ArrayList<>(); - //新建最终可以进行减员的福利档案基础信息id列表 List toStopBaseInfoIdList = new ArrayList<>(); //新建最终不可以进行减员的福利档案基础信息id列表 @@ -997,10 +995,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService //获取社保档案 socialList = getSocialSchemeMapper().getSocialById(socialIds); //筛选可减员的社保档案相关信息 - toStopSocialIds = socialList.stream().filter(f-> f.getSocialSchemeId() == null || (f.getSocialEndTime() != null && f.getSocialEndTime().length() > 0 && (f.getSocialEndTime().compareTo(todayMonth)) <= 0)) .map(InsuranceArchivesSocialSchemePO::getId).collect(Collectors.toList()); - // + List finalToStopSocialIds = toStopSocialIds; noStopBaseInfoIds = baseInfoPOList.stream().filter(f -> !finalToStopSocialIds.contains(f.getSocialArchivesId())).map(InsuranceArchivesBaseInfoPO::getId).collect(Collectors.toList()); @@ -1028,7 +1025,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService //社保、公积金、其他福利档案的可减员的人员信息与入参中的人员信息一致时 toStopBaseInfoIdList = baseInfoIds; } else { - //与最终不可减员的baseInfoId信息做差集 toStopBaseInfoIdList = (List) CollectionUtils.subtract(baseInfoIds, noStopBaseInfoIds); } @@ -1036,7 +1032,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (toStopBaseInfoIdList.size() > 0) { getInsuranceBaseInfoMapper().updateRunStatusByIds(InsuranceArchivesBaseInfoPO.builder() .ids(toStopBaseInfoIdList).runStatus(EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue()).build()); - //记录操作日志 toStopBaseInfoIdList.forEach(f -> { InsuranceArchivesBaseInfoPO targetPO = getInsuranceBaseInfoMapper().getById(f); @@ -1163,19 +1158,15 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (CollectionUtils.isEmpty(ids)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); } - // List baseInfoPOList = new ArrayList<>(); List> partitionInfo = Lists.partition((List) ids, 100); partitionInfo.forEach(part -> baseInfoPOList.addAll( getInsuranceBaseInfoMapper().listByIds(part))); - // - //分别新建福利档案基础信息相关的社保、公积金、其他福利档案列表 List socialList = new ArrayList<>(); List fundList = new ArrayList<>(); List otherList = new ArrayList<>(); - //新建最终可以进行增员的福利档案基础信息id列表 List toPayBaseInfoIdList = new ArrayList<>(); //新建最终不可以进行增员的福利档案基础信息id列表 @@ -1360,7 +1351,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (insuranceArchivesBaseInfoPO.getIds() == null || StringUtils.isBlank(insuranceArchivesBaseInfoPO.getRunStatus())) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "参数错误")); } - if (insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())) { List> baseInfoIdsPartition = Lists.partition((List) insuranceArchivesBaseInfoPO.getIds(), 100); List nowList = new ArrayList<>(); @@ -1377,7 +1367,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (isNotExist) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(116196, "个税扣缴义务人不存在或不在权限范围内，删除失败！")); } - //置空社保、公积金、其他福利档案的最后缴纳月信息，并将福利档案基础信息表的状态置为“正在缴纳” if (nowList.size() > 0) { List socialIds = nowList.stream() @@ -1443,7 +1432,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService // List adjustHistoryDTOS = siArchivesBiz.getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); List adjustHistoryDTOS = getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId()); - // 分权逻辑 Boolean needAuth = getTaxAgentService(user).isNeedAuth((long) user.getUID()); if (needAuth) { @@ -1605,8 +1593,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * 判断是否需要生成历史福利档案基本信息 */ public Boolean createOldInsuranceBaseInfo(Long creator) { - - log.info("判断是否需要生成历史数据"); List nowBaseInfoList = getInsuranceBaseInfoMapper().getInsuranceBaseInfoList(); if (nowBaseInfoList.size() == 0) { @@ -1633,7 +1619,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService InsuranceArchivesOtherSchemePO toDealOtherPO = toDealOtherList.get(0); toDealOtherPO.setPaymentOrganization(socialSchemePO.getPaymentOrganization()); updateOtherList.add(toDealOtherPO); - } } @@ -1676,8 +1661,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService }else { return false; } - - } else { return false; } @@ -1693,178 +1676,173 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * @return */ public List> buildTableData(List insuranceArchivesEmployeePOS, boolean export) { - boolean welBaseDiffSign = isDiffWelBase(); List taxAgentPOS = getTaxAgentMapper().listAll(); Map longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + List> records = new ArrayList<>(); - try { - InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); - Map socialSchemePOMap = encryptUtil.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesSocialSchemePO.class) - .stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getId, Function.identity())); + Map socialSchemePOMap = encryptUtil.decryptList(this.getSocialByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesSocialSchemePO.class) + .stream().collect(Collectors.toMap(InsuranceArchivesSocialSchemePO::getId, Function.identity())); - Map fundSchemePOMap = encryptUtil.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesFundSchemePO.class) - .stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getId, Function.identity())); - List otherByEmployeeList = this.getOtherByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS); - encryptUtil.decryptList(otherByEmployeeList, InsuranceArchivesOtherSchemePO.class); - Map otherSchemePOMap = otherByEmployeeList - .stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getId, Function.identity())); - insuranceArchivesEmployeePOS.forEach(item -> { - InsuranceArchivesSocialSchemePO socialItem = socialSchemePOMap.get(item.getSocialId()); - InsuranceArchivesFundSchemePO fundItem = fundSchemePOMap.get(item.getFundId()); - InsuranceArchivesOtherSchemePO otherItem = otherSchemePOMap.get(item.getOtherId()); - Map map = new HashMap<>(); - map.put("employeeName", item.getUserName()); - map.put("paymentOrganizationName", longTaxAgentPOMap.get(item.getPaymentOrganization()) != null ? longTaxAgentPOMap.get(item.getPaymentOrganization()).getName() : ""); - map.put("employeeId", item.getEmployeeId()); - map.put("departmentName", item.getDepartmentName()); - map.put("subcompanyName", item.getSubcompanyName()); - map.put("departmentId", item.getDepartmentId()); - map.put("jobNum", item.getJobNum()); - map.put("companystartdate", item.getCompanystartdate()); - map.put("dismissdate", item.getDimissionDate()); - map.put("mobile", item.getTelephone()); - map.put("siSchemeId", item.getSiSchemeId()); - map.put("fundSchemeId", item.getFundSchemeId()); - map.put("otherSchemeId", item.getOtherSchemeId()); - map.put("status", item.getUserStatus() != null ? UserStatusEnum.getDefaultLabelByValue(item.getUserStatus()) : ""); - map.put("baseInfo", item.getBaseInfoId()); - map.put("paymentOrganization", item.getPaymentOrganization()); - if (socialItem != null) { - map.put("socialName", insuranceSchemeMapper.querySchemeName(socialItem.getSocialSchemeId())); - Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { - }); - if (welBaseDiffSign) { - if (socialJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); - socialJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k + "per", v); - } - }); - } - Map socialComJson = JSON.parseObject(socialItem.getSocialPaymentComBaseString(), new TypeReference>() { + Map fundSchemePOMap = encryptUtil.decryptList(this.getFundByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS), InsuranceArchivesFundSchemePO.class) + .stream().collect(Collectors.toMap(InsuranceArchivesFundSchemePO::getId, Function.identity())); + List otherByEmployeeList = this.getOtherByEmployeeIdAndPayOrg(insuranceArchivesEmployeePOS); + encryptUtil.decryptList(otherByEmployeeList, InsuranceArchivesOtherSchemePO.class); + Map otherSchemePOMap = otherByEmployeeList + .stream().collect(Collectors.toMap(InsuranceArchivesOtherSchemePO::getId, Function.identity())); + insuranceArchivesEmployeePOS.forEach(item -> { + InsuranceArchivesSocialSchemePO socialItem = socialSchemePOMap.get(item.getSocialId()); + InsuranceArchivesFundSchemePO fundItem = fundSchemePOMap.get(item.getFundId()); + InsuranceArchivesOtherSchemePO otherItem = otherSchemePOMap.get(item.getOtherId()); + Map map = new HashMap<>(); + map.put("employeeName", item.getUserName()); + map.put("paymentOrganizationName", longTaxAgentPOMap.get(item.getPaymentOrganization()) != null ? longTaxAgentPOMap.get(item.getPaymentOrganization()).getName() : ""); + map.put("employeeId", item.getEmployeeId()); + map.put("departmentName", item.getDepartmentName()); + map.put("subcompanyName", item.getSubcompanyName()); + map.put("departmentId", item.getDepartmentId()); + map.put("jobNum", item.getJobNum()); + map.put("companystartdate", item.getCompanystartdate()); + map.put("dismissdate", item.getDimissionDate()); + map.put("mobile", item.getTelephone()); + map.put("siSchemeId", item.getSiSchemeId()); + map.put("fundSchemeId", item.getFundSchemeId()); + map.put("otherSchemeId", item.getOtherSchemeId()); + map.put("status", item.getUserStatus() != null ? UserStatusEnum.getDefaultLabelByValue(item.getUserStatus()) : ""); + map.put("baseInfo", item.getBaseInfoId()); + map.put("paymentOrganization", item.getPaymentOrganization()); + if (socialItem != null) { + map.put("socialName", getInsuranceSchemeMapper().querySchemeName(socialItem.getSocialSchemeId())); + Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { + }); + if (welBaseDiffSign) { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(), PaymentScopeEnum.SCOPE_PERSON.getValue()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } }); - if (socialComJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); - socialComJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k + "com", v); - } - }); - } - } else { - if (socialJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId()); - socialJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } - }); - } } - - map.put("socialAccount", socialItem.getSocialAccount()); - map.put("socialStartTime", socialItem.getSocialStartTime()); - map.put("socialEndTime", socialItem.getSocialEndTime()); - } - if (fundItem != null) { - map.put("fundName", insuranceSchemeMapper.querySchemeName(fundItem.getFundSchemeId())); - map.put("fundAccount", fundItem.getFundAccount()); - Map fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference>() { + Map socialComJson = JSON.parseObject(socialItem.getSocialPaymentComBaseString(), new TypeReference>() { }); - if (welBaseDiffSign) { - if (fundJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); - fundJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k + "per", v); - } - }); - } - Map fundComJson = JSON.parseObject(fundItem.getFundPaymentComBaseString(), new TypeReference>() { + if (socialComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + socialComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (socialJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(socialItem.getSocialSchemeId()); + socialJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } }); - if (fundComJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); - fundComJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k + "com", v); - } - }); - } - } else { - if (fundJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId()); - fundJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } - }); - } } - - map.put("supplementFundAccount", fundItem.getSupplementFundAccount()); - map.put("fundStartTime", fundItem.getFundStartTime()); - map.put("fundEndTime", fundItem.getFundEndTime()); - } - if (otherItem != null) { - map.put("otherName", insuranceSchemeMapper.querySchemeName(otherItem.getOtherSchemeId())); - Map otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference>() { + + map.put("socialAccount", socialItem.getSocialAccount()); + map.put("socialStartTime", socialItem.getSocialStartTime()); + map.put("socialEndTime", socialItem.getSocialEndTime()); + } + if (fundItem != null) { + map.put("fundName", getInsuranceSchemeMapper().querySchemeName(fundItem.getFundSchemeId())); + map.put("fundAccount", fundItem.getFundAccount()); + Map fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference>() { + }); + if (welBaseDiffSign) { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map fundComJson = JSON.parseObject(fundItem.getFundPaymentComBaseString(), new TypeReference>() { }); - if (welBaseDiffSign) { - if (otherJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); - otherJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k + "per", v); - } - }); - } - Map otherComJson = JSON.parseObject(otherItem.getOtherPaymentComBaseString(), new TypeReference>() { + if (fundComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + fundComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (fundJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(fundItem.getFundSchemeId()); + fundJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } }); - if (otherComJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); - otherComJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k + "com", v); - } - }); - } - } else { - if (otherJson != null) { - //查询该福利方案下开启缴纳的福利项 - List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId()); - otherJson.forEach((k, v) -> { - if (insuranceIdList.contains(Long.valueOf(k))) { - map.put(k, v); - } - }); - } } - - map.put("otherStartTime", otherItem.getOtherStartTime()); - map.put("otherEndTime", otherItem.getOtherEndTime()); } - records.add(map); - }); - return records; - } finally { - sqlSession.close(); - } + map.put("supplementFundAccount", fundItem.getSupplementFundAccount()); + map.put("fundStartTime", fundItem.getFundStartTime()); + map.put("fundEndTime", fundItem.getFundEndTime()); + + } + if (otherItem != null) { + map.put("otherName", getInsuranceSchemeMapper().querySchemeName(otherItem.getOtherSchemeId())); + Map otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference>() { + }); + if (welBaseDiffSign) { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_PERSON.getValue()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "per", v); + } + }); + } + Map otherComJson = JSON.parseObject(otherItem.getOtherPaymentComBaseString(), new TypeReference>() { + }); + if (otherComJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId(),PaymentScopeEnum.SCOPE_COMPANY.getValue()); + otherComJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k + "com", v); + } + }); + } + } else { + if (otherJson != null) { + //查询该福利方案下开启缴纳的福利项 + List insuranceIdList = payInsuranceIds(otherItem.getOtherSchemeId()); + otherJson.forEach((k, v) -> { + if (insuranceIdList.contains(Long.valueOf(k))) { + map.put(k, v); + } + }); + } + } + + map.put("otherStartTime", otherItem.getOtherStartTime()); + map.put("otherEndTime", otherItem.getOtherEndTime()); + } + records.add(map); + }); + return records; + + } @Override @@ -1880,54 +1858,39 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * 根据人员id和个税扣缴人id获取记录 */ public List getSocialByEmployeeIdAndPayOrg(List insuranceArchivesEmployeePOS) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); - List allList = new ArrayList<>(); - for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { - List socialList = socialSchemeMapper.getSocialByEmployeeIdAndPayOrg(po); - if (socialList.size() > 0) { - allList.add(socialList.get(0)); - } + + List allList = new ArrayList<>(); + for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { + List socialList = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(po); + if (socialList.size() > 0) { + allList.add(socialList.get(0)); } - return allList; - } finally { - sqlSession.close(); } + return allList; } public List getFundByEmployeeIdAndPayOrg(List insuranceArchivesEmployeePOS) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); - List allList = new ArrayList<>(); - for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { - List fundList = fundSchemeMapper.getFundByEmployeeIdAndPayOrg(po); - if (fundList.size() > 0) { - allList.add(fundList.get(0)); - } + + List allList = new ArrayList<>(); + for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { + List fundList = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(po); + if (fundList.size() > 0) { + allList.add(fundList.get(0)); } - return allList; - } finally { - sqlSession.close(); } + return allList; } public List getOtherByEmployeeIdAndPayOrg(List insuranceArchivesEmployeePOS) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); - List allList = new ArrayList<>(); - for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { - List otherList = otherSchemeMapper.getOtherByEmployeeIdAndPayOrg(po); - if (otherList.size() > 0) { - allList.add(otherList.get(0)); - } + + List allList = new ArrayList<>(); + for (InsuranceArchivesEmployeePO po : insuranceArchivesEmployeePOS) { + List otherList = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(po); + if (otherList.size() > 0) { + allList.add(otherList.get(0)); } - return allList; - } finally { - sqlSession.close(); } + return allList; } @Override @@ -2238,20 +2201,15 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * */ public List getBaseHistoryByEmployeeIdAndOperator(Long operator, Long employeeId) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceBaseAdjustHistoryMapper mapper = sqlSession.getMapper(InsuranceBaseAdjustHistoryMapper.class); - List empList = mapper.listByEmployeeIdAndOperator(operator, employeeId); - List extEmpList = mapper.listByExtEmpIdAndOperator(operator, employeeId); - if (extEmpList != null) { - empList.addAll(extEmpList); - empList = empList.stream().filter(f -> org.apache.commons.lang.StringUtils.isNotBlank(f.getEmployeeName())) - .sorted(Comparator.comparing(InsuranceArchivesBaseHistoryDTO::getOperateTime).reversed()).collect(Collectors.toList()); - } - return empList; - } finally { - sqlSession.close(); + + List empList = getInsuranceBaseAdjustHistoryMapper().listByEmployeeIdAndOperator(operator, employeeId); + List extEmpList = getInsuranceBaseAdjustHistoryMapper().listByExtEmpIdAndOperator(operator, employeeId); + if (extEmpList != null) { + empList.addAll(extEmpList); + empList = empList.stream().filter(f -> org.apache.commons.lang.StringUtils.isNotBlank(f.getEmployeeName())) + .sorted(Comparator.comparing(InsuranceArchivesBaseHistoryDTO::getOperateTime).reversed()).collect(Collectors.toList()); } + return empList; } //生成基数调整记录（基数单元未变化则忽略） @@ -2394,15 +2352,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (org.apache.commons.collections.CollectionUtils.isEmpty(adjustHistoryList)) { return; } - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceBaseAdjustHistoryMapper mapper = sqlSession.getMapper(InsuranceBaseAdjustHistoryMapper.class); - List> partition = Lists.partition(adjustHistoryList, 100); - partition.forEach(mapper::batchSave); - sqlSession.commit(); - } finally { - sqlSession.close(); - } + List> partition = Lists.partition(adjustHistoryList, 100); + partition.forEach(getInsuranceBaseAdjustHistoryMapper()::batchSave); } public Map getBaseForm(WelfareTypeEnum welfareType, Long employeeId, Long paymentOrganization, Collection taxAgentPOS) { @@ -2412,7 +2363,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService SalaryAssert.notEmpty(employeeByIds, SalaryI18nUtil.getI18nLabel(0, "员工信息不存在")); DataCollectionEmployee item = employeeByIds.get(0); - if (welfareType == null) { //基础信息表单 InsuranceArchivesBaseDTO insuranceArchivesBaseDTO = InsuranceArchivesBaseDTO.builder().department(item.getDepartmentName()) @@ -2436,8 +2386,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService List paymentOptions = paymentOrganizationOptions(taxAgentPOS); List underTakeOptions = Arrays.stream(UndertakerEnum.values()) .map(e -> new SearchConditionOption(e.getValue().toString(), e.getDefaultLabel())).collect(Collectors.toList()); - - //返回数据 switch (welfareType) { case SOCIAL_SECURITY: @@ -2550,25 +2498,19 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * @return */ public InsuranceArchivesOtherSchemeDTO buildOtherForm(Long employeeId, Long paymentOrganization) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); - List otherList = otherSchemeMapper.getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() - .employeeId(employeeId) - .paymentOrganization(paymentOrganization) - .build()); - encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); - InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = otherList.size() != 0 ? otherList.get(0) : null; - InsuranceArchivesOtherSchemeDTO data = InsuranceArchivesBO.convertOtherPOtoDTO(insuranceArchivesOtherSchemePO, employeeId); - if (insuranceArchivesOtherSchemePO == null) { - data.setEmployeeId(employeeId); - data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); - } - return data; - } finally { - sqlSession.close(); - } + List otherList = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrganization) + .build()); + encryptUtil.decryptList(otherList, InsuranceArchivesOtherSchemePO.class); + InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = otherList.size() != 0 ? otherList.get(0) : null; + InsuranceArchivesOtherSchemeDTO data = InsuranceArchivesBO.convertOtherPOtoDTO(insuranceArchivesOtherSchemePO, employeeId); + if (insuranceArchivesOtherSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); + } + return data; } /** @@ -2579,25 +2521,18 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService */ public InsuranceArchivesFundSchemeDTO buildFundForm(Long employeeId, Long paymentOrganization) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); - List fundList = fundSchemeMapper.getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() - .employeeId(employeeId) - .paymentOrganization(paymentOrganization) - .build()); - encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); - InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = fundList.size() != 0 ? fundList.get(0) : null; - InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId); - if (insuranceArchivesFundSchemePO == null) { - data.setEmployeeId(employeeId); - data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); - } - return data; - } finally { - sqlSession.close(); + List fundList = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrganization) + .build()); + encryptUtil.decryptList(fundList, InsuranceArchivesFundSchemePO.class); + InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = fundList.size() != 0 ? fundList.get(0) : null; + InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId); + if (insuranceArchivesFundSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue().toString()); } - + return data; } /** @@ -2623,18 +2558,13 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * @return */ public InsuranceArchivesSocialSchemePO getSocialByEmployeeId(Long employeeId, Long paymentOrganization) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); - List socialList = socialSchemeMapper.getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() - .employeeId(employeeId) - .paymentOrganization(paymentOrganization) - .build()); - encryptUtil.decryptList(socialList, InsuranceArchivesSocialSchemePO.class); - return socialList.size() != 0 ? socialList.get(0) : null; - } finally { - sqlSession.close(); - } + + List socialList = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO.builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrganization) + .build()); + encryptUtil.decryptList(socialList, InsuranceArchivesSocialSchemePO.class); + return socialList.size() != 0 ? socialList.get(0) : null; } /** @@ -2887,15 +2817,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService * @return */ public List queryListByPrimaryIdIsPayment(Long schemeId, Integer welfareType) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListByPrimaryIdIsPayment(schemeId, IsPaymentEnum.YES.getValue(), welfareType); - encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - return insuranceSchemeDetailPOS; - } finally { - sqlSession.close(); - } + + List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListByPrimaryIdIsPayment(schemeId, IsPaymentEnum.YES.getValue(), welfareType); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPOS; } public void otherSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) { @@ -3461,7 +3386,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } for (Map.Entry entry : paymentBaseJson.entrySet()) { - //判断福利值是否为空/数字 if (entry.getValue() == null || entry.getValue().length() == 0) { continue; @@ -3601,89 +3525,83 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService //是否分权 Boolean needAuth = param.getNeedAuth(); StopWatch sw = new StopWatch(); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); Map datas = new HashMap<>(16); - try { - SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); - List page = new ArrayList<>(); - PageInfo pageInfo = new PageInfo<>(InsuranceArchivesEmployeePO.class); - //获取福利档案列表数据 - if (needAuth) { - Collection taxAgentEmployeeIds = param.getTaxAgentEmployeeIds(); - Collection taxAgentIds = param.getTaxAgentIds(); - log.info("从数据库获取档案列表数据开始"); - sw.start("获取福利档案列表数据"); - if (param.isExtWelArchiveList()) { - page = socialSchemeMapper.queryExtEmployeeList(param); - } else { - page = socialSchemeMapper.queryEmployeeList(param); - } - sw.stop(); - log.info("从数据库获取档案列表数据完成！"); - page = page.stream().filter(f -> + + List page = new ArrayList<>(); + PageInfo pageInfo = new PageInfo<>(InsuranceArchivesEmployeePO.class); + //获取福利档案列表数据 + if (needAuth) { + Collection taxAgentEmployeeIds = param.getTaxAgentEmployeeIds(); + Collection taxAgentIds = param.getTaxAgentIds(); + log.info("从数据库获取档案列表数据开始"); + sw.start("获取福利档案列表数据"); + if (param.isExtWelArchiveList()) { + page = getSocialSchemeMapper().queryExtEmployeeList(param); + } else { + page = getSocialSchemeMapper().queryEmployeeList(param); + } + sw.stop(); + log.info("从数据库获取档案列表数据完成！"); + page = page.stream().filter(f -> // taxAgentEmployeeIds.contains(f.getEmployeeId())|| - taxAgentIds.contains(f.getPaymentOrganization()) - ).collect(Collectors.toList()); - // 填充总数和当页数据 - // 分页参数 - pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), InsuranceArchivesEmployeePO.class); - pageInfo.setTotal(page.size()); - pageInfo.setList(SalaryPageUtil.subList(pageInfo.getPageNum(), pageInfo.getPageSize(), page)); + taxAgentIds.contains(f.getPaymentOrganization()) + ).collect(Collectors.toList()); + // 填充总数和当页数据 + // 分页参数 + pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), InsuranceArchivesEmployeePO.class); + pageInfo.setTotal(page.size()); + pageInfo.setList(SalaryPageUtil.subList(pageInfo.getPageNum(), pageInfo.getPageSize(), page)); + } else { + log.info("从数据库获取档案列表数据开始"); + sw.start("获取档案列表数据"); + if (param.isExtWelArchiveList()) { + page = getSocialSchemeMapper().queryExtEmployeeList(param); } else { - log.info("从数据库获取档案列表数据开始"); - sw.start("获取档案列表数据"); - if (param.isExtWelArchiveList()) { - page = socialSchemeMapper.queryExtEmployeeList(param); - } else { - page = socialSchemeMapper.queryEmployeeList(param); - } - sw.stop(); - log.info("从数据库获取档案列表数据完成！"); - pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), - page, InsuranceArchivesEmployeePO.class); - } - List> records = null; - log.info("buildTableData方法处理福利档案列表数据开始"); - sw.start("buildTableData方法处理福利档案列表数据"); - if (param.getExportData() != null && param.getExportData()) { - records = buildTableData(pageInfo.getList(), true); - } else { - records = buildTableData(pageInfo.getList(), false); + page = getSocialSchemeMapper().queryEmployeeList(param); } sw.stop(); - log.info("buildTableData方法处理福利档案列表数据完成！"); - - log.info("buildWeaTableColumns方法处理福利档案列表数据开始"); - sw.start("buildWeaTableColumns方法处理福利档案列表数据"); - List columns = buildWeaTableColumns(pageInfo.getList()); - sw.stop(); - log.info("buildWeaTableColumns方法处理福利档案列表数据完成！"); - WeaTable table = new WeaTable(); - table.setColumns(columns); - //设置check是否可用 - List checkboxpopedomList = new ArrayList<>(); - WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom(); - checkboxpopedom.setPopedompara("column:system_type"); - checkboxpopedom.setShowmethod("com.engine.salary.transmethod.TaxRateTransMethod.getCheckBoxPopedom"); - checkboxpopedomList.add(checkboxpopedom); - table.setCheckboxList(checkboxpopedomList); - table.setCheckboxpopedom(null); - - WeaResultMsg result = new WeaResultMsg(false); - result.putAll(table.makeDataResult()); - result.success(); - - datas.put("pageInfo", pageInfo); - datas.put("datas", records); - datas.put("columns", columns); - datas.put("dataKey", result.getResultMap()); - - log.info("各操作计时 {}", sw.prettyPrint()); - return datas; - - } finally { - sqlSession.close(); + log.info("从数据库获取档案列表数据完成！"); + pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), + page, InsuranceArchivesEmployeePO.class); } + List> records = null; + log.info("buildTableData方法处理福利档案列表数据开始"); + sw.start("buildTableData方法处理福利档案列表数据"); + if (param.getExportData() != null && param.getExportData()) { + records = buildTableData(pageInfo.getList(), true); + } else { + records = buildTableData(pageInfo.getList(), false); + } + sw.stop(); + log.info("buildTableData方法处理福利档案列表数据完成！"); + + log.info("buildWeaTableColumns方法处理福利档案列表数据开始"); + sw.start("buildWeaTableColumns方法处理福利档案列表数据"); + List columns = buildWeaTableColumns(pageInfo.getList()); + sw.stop(); + log.info("buildWeaTableColumns方法处理福利档案列表数据完成！"); + WeaTable table = new WeaTable(); + table.setColumns(columns); + //设置check是否可用 + List checkboxpopedomList = new ArrayList<>(); + WeaTableCheckboxpopedom checkboxpopedom = new WeaTableCheckboxpopedom(); + checkboxpopedom.setPopedompara("column:system_type"); + checkboxpopedom.setShowmethod("com.engine.salary.transmethod.TaxRateTransMethod.getCheckBoxPopedom"); + checkboxpopedomList.add(checkboxpopedom); + table.setCheckboxList(checkboxpopedomList); + table.setCheckboxpopedom(null); + + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + + datas.put("pageInfo", pageInfo); + datas.put("datas", records); + datas.put("columns", columns); + datas.put("dataKey", result.getResultMap()); + + log.info("各操作计时 {}", sw.prettyPrint()); + return datas; } /** @@ -3712,15 +3630,11 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService List> taxAgentList = getTaxAgentWrapper(user).selectListAsAdmin(); List taxAgentOption = taxAgentList.stream().map(item -> new SearchConditionOption(item.get("id").toString(), item.get("content").toString())).collect(Collectors.toList()); - Map apidatas = new HashMap(); ConditionFactory conditionFactory = new ConditionFactory(user); - //条件组 List addGroups = new ArrayList(); - List conditionItems = new ArrayList(); - //文本输入框 SearchConditionItem username = conditionFactory.createCondition(ConditionType.INPUT, 25034, "username"); username.setInputType("input"); @@ -3730,7 +3644,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService username.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 username.setLabel(SalaryI18nUtil.getI18nLabel(0,"姓名")); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(username); - //文本输入框 SearchConditionItem jobNum = conditionFactory.createCondition(ConditionType.INPUT, 25034, "jobNum"); jobNum.setInputType("input"); @@ -3741,7 +3654,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService jobNum.setLabel(SalaryI18nUtil.getI18nLabel(0,"工号")); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(jobNum); - SearchConditionItem departmentIds = conditionFactory.createCondition(ConditionType.BROWSER, 502329, "departmentIdsStr", "57"); departmentIds.setColSpan(2); departmentIds.setFieldcol(16); @@ -3749,7 +3661,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService departmentIds.setLabel(SalaryI18nUtil.getI18nLabel(0,"部门")); conditionItems.add(departmentIds); - SearchConditionItem statuses = conditionFactory.createCondition(ConditionType.SELECT, 502327, "statusesStr"); statuses.setInputType("select"); statuses.setMultiple(true); @@ -3761,7 +3672,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService statuses.setLabel(SalaryI18nUtil.getI18nLabel(0,"状态")); conditionItems.add(statuses); - SearchConditionItem positions = conditionFactory.createCondition(ConditionType.BROWSER, 502327, "positionsStr", "278"); positions.setInputType("browser"); positions.setColSpan(2); @@ -3810,7 +3720,6 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService siSchemeId.setLabel(SalaryI18nUtil.getI18nLabel(0,"社保方案")); conditionItems.add(siSchemeId); - SearchConditionItem fundSchemeId = conditionFactory.createCondition(ConditionType.SELECT, 502327, "fundSchemeId"); fundSchemeId.setInputType("select"); fundSchemeId.setOptions(fundOption); @@ -3848,53 +3757,38 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public List getSocialByEmployeeIds(List employeeIds) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); - List> partition = Lists.partition(employeeIds, 1000); - List allList = new ArrayList<>(); - for (List longs : partition) { - List socialList = socialSchemeMapper.getSocialByEmployeeId(longs); - allList.addAll(socialList); - } - return allList; - } finally { - sqlSession.close(); + + List> partition = Lists.partition(employeeIds, 1000); + List allList = new ArrayList<>(); + for (List longs : partition) { + List socialList = getSocialSchemeMapper().getSocialByEmployeeId(longs); + allList.addAll(socialList); } + return allList; } @Override public List getFundByEmployeeIds(List employeeIds) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); - List> partition = Lists.partition(employeeIds, 1000); - List allList = new ArrayList<>(); - for (List longs : partition) { - List fundList = fundSchemeMapper.getFundByEmployeeId(longs); - allList.addAll(fundList); - } - return allList; - } finally { - sqlSession.close(); + + List> partition = Lists.partition(employeeIds, 1000); + List allList = new ArrayList<>(); + for (List longs : partition) { + List fundList = getFundSchemeMapper().getFundByEmployeeId(longs); + allList.addAll(fundList); } + return allList; } @Override public List getOtherByEmployeeIds(List employeeIds) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); - List> partition = Lists.partition(employeeIds, 1000); - List allList = new ArrayList<>(); - for (List longs : partition) { - List otherList = otherSchemeMapper.getOtherByEmployeeId(longs); - allList.addAll(otherList); - } - return allList; - } finally { - sqlSession.close(); + + List> partition = Lists.partition(employeeIds, 1000); + List allList = new ArrayList<>(); + for (List longs : partition) { + List otherList = getOtherSchemeMapper().getOtherByEmployeeId(longs); + allList.addAll(otherList); } + return allList; } /** diff --git a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java index 453ff9729..7e127f570 100644 --- a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java @@ -38,8 +38,6 @@ import com.mzlion.core.utils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.session.SqlSession; -import weaver.conn.mybatis.MyBatisFactory; import weaver.hrm.User; import java.util.*; @@ -377,15 +375,10 @@ public class SICategoryServiceImpl extends Service implements SICategoryService */ @Override public ICategoryPO getICategoryPOByID(Long id) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); - ICategoryPO iCategoryPO = iCategoryMapper.getById(id); - return iCategoryPO; - } finally { - sqlSession.close(); - } + ICategoryPO iCategoryPO = getICategoryMapper().getById(id); + return iCategoryPO; + } /** @@ -395,16 +388,10 @@ public class SICategoryServiceImpl extends Service implements SICategoryService */ @Override public List listByName(String insuranceName) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try{ - ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); - List iCategoryPOS = iCategoryMapper.listByName(insuranceName); - return iCategoryPOS; + List iCategoryPOS = getICategoryMapper().listByName(insuranceName); + return iCategoryPOS; - } finally { - sqlSession.close(); - } } /** @@ -437,30 +424,24 @@ public class SICategoryServiceImpl extends Service implements SICategoryService * @param iCategoryFormDTO */ public void update(ICategoryFormDTO iCategoryFormDTO) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try{ - if (iCategoryFormDTO.getId() == null) { - throw new SalaryRunTimeException("id is required"); - } - ICategoryPO iCategoryPO = getICategoryPOByID(iCategoryFormDTO.getId()); - if (Objects.isNull(iCategoryPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"数据不存在")); - } - List iCategoryPOS = listByName(iCategoryFormDTO.getInsuranceName()); - if (CollectionUtils.isNotEmpty(iCategoryPOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利名称不允许重复")); - } - iCategoryPO.setInsuranceName(iCategoryFormDTO.getInsuranceName()); + if (iCategoryFormDTO.getId() == null) { + throw new SalaryRunTimeException("id is required"); + } + ICategoryPO iCategoryPO = getICategoryPOByID(iCategoryFormDTO.getId()); + if (Objects.isNull(iCategoryPO)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"数据不存在")); + } + List iCategoryPOS = listByName(iCategoryFormDTO.getInsuranceName()); + if (CollectionUtils.isNotEmpty(iCategoryPOS)) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"福利名称不允许重复")); + } + iCategoryPO.setInsuranceName(iCategoryFormDTO.getInsuranceName()); // iCategoryPO.setWelfareType(iCategoryFormDTO.getWelfareType().getValue()); // iCategoryPO.setPaymentScope(SalaryEnumUtil.enumArrToString(iCategoryFormDTO.getPaymentScope())); - iCategoryPO.setUpdateTime(new Date()); - ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); - iCategoryMapper.update(iCategoryPO); + iCategoryPO.setUpdateTime(new Date()); + + getICategoryMapper().update(iCategoryPO); - sqlSession.commit(); - } finally { - sqlSession.close(); - } } /** diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index ac0391195..491850815 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -279,15 +279,10 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { @Override public List queryListByInsuranceIdIsPayment(Long insuranceId, Integer isPayment) { // return new SISchemeBiz().queryListByInsuranceIdIsPayment(insuranceId, isPayment); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - List insuranceSchemeDetailPOList = insuranceSchemeDetailMapper.queryListByInsuranceIdIsPayment(insuranceId, isPayment); - encryptUtil.decryptList(insuranceSchemeDetailPOList, InsuranceSchemeDetailPO.class); - return insuranceSchemeDetailPOList; - } finally { - sqlSession.close(); - } + + List insuranceSchemeDetailPOList = getInsuranceSchemeDetailMapper().queryListByInsuranceIdIsPayment(insuranceId, isPayment); + encryptUtil.decryptList(insuranceSchemeDetailPOList, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPOList; } @Override @@ -2387,15 +2382,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { */ public InsuranceSchemePO getById(Long id) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); - InsuranceSchemePO insuranceSchemePO = insuranceSchemeMapper.getById(id); - - return insuranceSchemePO; - } finally { - sqlSession.close(); - } + InsuranceSchemePO insuranceSchemePO = getInsuranceSchemeMapper().getById(id); + return insuranceSchemePO; } /** @@ -2405,14 +2393,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { * @return */ public List listByWelfareType(Integer welfareType) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); - List insuranceCategoryPOS = iCategoryMapper.listByWelfareType(welfareType, null); - return insuranceCategoryPOS; - } finally { - sqlSession.close(); - } + + List insuranceCategoryPOS = getICategoryMapper().listByWelfareType(welfareType, null); + return insuranceCategoryPOS; } public boolean numberCheck(String number) { @@ -2420,15 +2403,11 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } private InsuranceSchemeDetailPO getByPPI(Long primaryId, Integer paymentScope, Long insuranceId) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - InsuranceSchemeDetailPO insuranceSchemeDetailPO = insuranceSchemeDetailMapper.getByPPI(primaryId, paymentScope, insuranceId); - encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); - return insuranceSchemeDetailPO; - } finally { - sqlSession.close(); - } + + InsuranceSchemeDetailPO insuranceSchemeDetailPO = getInsuranceSchemeDetailMapper().getByPPI(primaryId, paymentScope, insuranceId); + encryptUtil.decrypt(insuranceSchemeDetailPO, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPO; + } /** @@ -2715,16 +2694,10 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { * @return */ public List listByPrimaryId(Long primaryId) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); - List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListBySchemeId(primaryId); - encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - return insuranceSchemeDetailPOS; - } finally { - sqlSession.close(); - } + List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(primaryId); + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + return insuranceSchemeDetailPOS; } /** @@ -2734,14 +2707,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { */ @Override public List listAll(){ - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); - List insuranceSchemePOList = insuranceSchemeMapper.listAll(); - return insuranceSchemePOList; - } finally { - sqlSession.close(); - } + + List insuranceSchemePOList = getInsuranceSchemeMapper().listAll(); + return insuranceSchemePOList; } /*****以上代码为SISchemeBiz中方法逻辑迁移，旨在减少Biz类的使用*****/ From 400d22cc9309713ebd66cdfd0b9a9497e1bc4217 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 20 Feb 2024 10:06:17 +0800 Subject: [PATCH 104/169] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=9F=A5=E7=9C=8B=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/biz/AttendQuoteDataValueBiz.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java index a9a7c96cc..5082f23d0 100644 --- a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java +++ b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java @@ -37,11 +37,15 @@ public class AttendQuoteDataValueBiz { AttendQuoteDataValueMapper mapper = sqlSession.getMapper(AttendQuoteDataValueMapper.class); List employeeIds = param.getEmployeeIds(); - List> partition = Lists.partition(employeeIds, 100); - partition.forEach(empIds -> { - param.setEmployeeIds(empIds); + if (CollectionUtils.isNotEmpty(employeeIds)) { + List> partition = Lists.partition(employeeIds, 100); + partition.forEach(empIds -> { + param.setEmployeeIds(empIds); + list.addAll(mapper.listSome(param)); + }); + } else { list.addAll(mapper.listSome(param)); - }); + } } finally { sqlSession.close(); } From 088a5c1d728fa590a3c3cd7da0b6ac914e937f79 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 20 Feb 2024 16:50:45 +0800 Subject: [PATCH 105/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E7=BC=B4=E7=BA=B3=E9=A1=B5=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siaccount/po/InsuranceAccountBatchPO.java | 19 +++ .../po/InsuranceAccountDetailPO.java | 49 +++++++ .../siaccount/po/InsuranceCompensationPO.java | 18 +++ .../InsuranceAccountBatchMapper.java | 3 + .../siaccount/InsuranceAccountBatchMapper.xml | 9 ++ .../service/impl/SIAccountServiceImpl.java | 138 +++++++++++++----- .../impl/SICompensationServiceImpl.java | 42 ++++++ 7 files changed, 243 insertions(+), 35 deletions(-) diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java index b3296596e..45de6f2ab 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.siaccount.po; import com.engine.salary.annotation.Encrypt; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -20,94 +21,112 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_bill_batch +@ElogTransform(name = "福利台账主表") public class InsuranceAccountBatchPO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 账单月份 */ + @ElogTransform(name = "账单月份") private String billMonth; /** * 账单状态 0-未归档 1-已归档 */ + @ElogTransform(name = "账单状态") private Integer billStatus; /** * 社保核算人数 */ + @ElogTransform(name = "社保核算人数") private Integer socialNum; /** * 公积金核算人数 */ + @ElogTransform(name = "公积金核算人数") private Integer fundNum; /** * 其他福利核算人数 */ + @ElogTransform(name = "其他福利核算人数") private Integer otherNum; /** * 社保缴费总额(单位+个人) */ @Encrypt + @ElogTransform(name = "社保缴费总额(单位+个人)") private String socialPay; /** * 公积金缴费总额(单位+个人) */ @Encrypt + @ElogTransform(name = "公积金缴费总额(单位+个人)") private String fundPay; /** * 其他福利缴费总额(单位+个人) */ @Encrypt + @ElogTransform(name = "其他福利缴费总额(单位+个人)") private String otherPay; /** * 核算人 */ + @ElogTransform(name = "核算人") private String accountant; /** * 备注 */ + @ElogTransform(name = "备注") private String remarks; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 个税扣缴义务人 */ + @ElogTransform(name = "个税扣缴义务人id") private Long paymentOrganization; diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java index 9cd2ad7f0..9b7c33cef 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java @@ -3,6 +3,7 @@ package com.engine.salary.entity.siaccount.po; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.salary.annotation.Encrypt; import com.engine.salary.annotation.SalaryTable; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -23,260 +24,308 @@ import java.util.Date; @AllArgsConstructor @SalaryTable(pageId = "2394fba1-1381-428a-8532-4e1e6b86626e", tableType = WeaTableType.CHECKBOX) //hrsa_bill_detail +@ElogTransform(name = "福利台账明细表") public class InsuranceAccountDetailPO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 员工id */ + @ElogTransform(name = "员工id") private Long employeeId; /** * 账单月份 */ + @ElogTransform(name = "账单月份") private String billMonth; /** * 账单状态 0-未归档 1-已归档 */ + @ElogTransform(name = "账单状态") private Integer billStatus; /** * 缴纳状态 */ + @ElogTransform(name = "缴纳状态") private Integer paymentStatus; /** * 补缴月份/退差月份 */ + @ElogTransform(name = "补缴月份/退差月份") private String supplementaryMonth; /** * 补缴项目 */ + @ElogTransform(name = "补缴项目") private String supplementaryProjects; /** * 数据来源 0-系统核算 1-临时数据 */ + @ElogTransform(name = "数据来源") private Integer resourceFrom; /** * 社保缴纳组织 */ + @ElogTransform(name = "社保缴纳组织") private Long socialPayOrg; /** * 社保账号 */ + @ElogTransform(name = "社保账号") private String socialAccount; /** * 公积金缴纳组织 */ + @ElogTransform(name = "公积金缴纳组织") private Long fundPayOrg; /** * 公积金账号 */ + @ElogTransform(name = "公积金账号") private String fundAccount; /** * 补充公积金账号 */ + @ElogTransform(name = "补充公积金账号") private String supplementFundAccount; /** * 其他福利缴纳组织 */ + @ElogTransform(name = "其他福利缴纳组织") private Long otherPayOrg; /** * 社保方案ID */ + @ElogTransform(name = "社保方案ID") private Long socialSchemeId; /** * 社保缴纳基数 */ @Encrypt + @ElogTransform(name = "社保缴纳基数") private String socialPaymentBaseString; /** * 社保缴纳基数——单位 */ @Encrypt + @ElogTransform(name = "社保缴纳基数——单位") private String socialPaymentComBaseString; /** * 公积金方案ID */ + @ElogTransform(name = "公积金方案ID") private Long fundSchemeId; /** * 公积金缴纳基数 */ @Encrypt + @ElogTransform(name = "公积金缴纳基数") private String fundPaymentBaseString; /** * 公积金缴纳基数——单位 */ @Encrypt + @ElogTransform(name = "公积金缴纳基数——单位") private String fundPaymentComBaseString; /** * 其他福利方案id */ + @ElogTransform(name = "其他福利方案id") private Long otherSchemeId; /** * 其他福利缴纳基数 */ @Encrypt + @ElogTransform(name = "其他福利缴纳基数") private String otherPaymentBaseString; /** * 其他福利缴纳基数——单位 */ @Encrypt + @ElogTransform(name = "其他福利缴纳基数——单位") private String otherPaymentComBaseString; /** * 社保个人缴费明细 */ @Encrypt + @ElogTransform(name = "社保个人缴费明细") private String socialPerJson; /** * 社保个人合计 */ @Encrypt + @ElogTransform(name = "社保个人合计") private String socialPerSum; /** * 公积金个人缴费明细 */ @Encrypt + @ElogTransform(name = "公积金个人缴费明细") private String fundPerJson; /** * 公积金个人合计 */ @Encrypt + @ElogTransform(name = "公积金个人合计") private String fundPerSum; /** * 其他福利个人缴费明细 */ @Encrypt + @ElogTransform(name = "其他福利个人缴费明细") private String otherPerJson; /** * 其他福利个人合计 */ @Encrypt + @ElogTransform(name = "其他福利个人合计") private String otherPerSum; /** * 个人合计 */ @Encrypt + @ElogTransform(name = "个人合计") private String perSum; /** * 社保单位缴费明细 */ @Encrypt + @ElogTransform(name = "社保单位缴费明细") private String socialComJson; /** * 社保单位合计 */ @Encrypt + @ElogTransform(name = "社保单位合计") private String socialComSum; /** * 公积金单位缴费明细 */ + @ElogTransform(name = "公积金单位缴费明细") private String fundComJson; /** * 公积金单位合计 */ + @ElogTransform(name = "公积金单位合计") private String fundComSum; /** * 其他福利单位缴费明细 */ + @ElogTransform(name = "其他福利单位缴费明细") private String otherComJson; /** * 其他福利单位合计 */ + @ElogTransform(name = "其他福利单位合计") private String otherComSum; /** * 单位合计 */ @Encrypt + @ElogTransform(name = "单位合计") private String comSum; /** * 社保合计 */ @Encrypt + @ElogTransform(name = "社保合计") private String socialSum; /** * 公积金合计 */ @Encrypt + @ElogTransform(name = "公积金合计") private String fundSum; /** * 其他福利合计 */ @Encrypt + @ElogTransform(name = "其他福利合计") private String otherSum; /** * 合计 */ @Encrypt + @ElogTransform(name = "合计") private String total; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 个税扣缴义务人 */ + @ElogTransform(name = "个税扣缴义务人") private Long paymentOrganization; } diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java index 24ebde645..ff9ece22b 100644 --- a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java +++ b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siaccount.po; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,86 +19,103 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_compensation_log +@ElogTransform(name = "福利台账-调差历史表") public class InsuranceCompensationPO { /** * 主键id */ + @ElogTransform(name = "主键id") private Long id; /** * 缴纳组织 */ + @ElogTransform(name = "缴纳组织") private Long paymentAgency; /** * 个税扣缴义务人 */ + @ElogTransform(name = "个税扣缴义务人id") private Long paymentOrganization; /** * 创建人id */ + @ElogTransform(name = "创建人id") private Long creator; /** * 是否删除 */ + @ElogTransform(name = "是否删除") private Integer deleteType; /** * 创建时间 */ + @ElogTransform(name = "创建时间") private Date createTime; /** * 更新时间 */ + @ElogTransform(name = "更新时间") private Date updateTime; /** * 租户key */ + @ElogTransform(name = "租户key") private String tenantKey; /** * 员工id */ + @ElogTransform(name = "员工id") private Long employeeId; /** * 统计调差福利 */ + @ElogTransform(name = "统计调差福利") private Integer welfareType; /** * 统计调差福利类型 */ + @ElogTransform(name = "统计调差福利类型") private String categoryType; /** * 国家核算金额 */ + @ElogTransform(name = "国家核算金额") private String countryTotal; /** * 公司核算金额 */ + @ElogTransform(name = "公司核算金额") private String companyTotal; /** * 应调差额 */ + @ElogTransform(name = "应调差额") private String adjustmentTotal; /** * 调差到 */ + @ElogTransform(name = "调差到") private Long adjustTo; /** * 账单月份 */ + @ElogTransform(name = "账单月份") private String billMonth; //---------条件------- diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java index 60cd71788..7a183297d 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java @@ -50,6 +50,9 @@ public interface InsuranceAccountBatchMapper { */ void updateById(InsuranceAccountBatchPO pos); + InsuranceAccountBatchPO getById(@Param("id") Long id); + + /** * * @param billMonth diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml index 61223c9b0..4b45cb2f3 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml @@ -244,6 +244,15 @@ + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml index c78a00525..e3d729fd4 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml @@ -97,7 +97,8 @@ send_total, last_send_time, send_status, - salary_acct_type + salary_acct_type, + creator FROM hrsa_salary_send WHERE delete_type = 0 AND id = #{id} diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java index bcf430d57..d0305777b 100644 --- a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java +++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java @@ -1,5 +1,6 @@ package com.engine.salary.report.entity.po; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.report.enums.UnitTypeEnum; import lombok.*; @@ -14,20 +15,25 @@ import java.util.Date; @ToString //hrsa_salary_statistics_item") //薪酬报表统计子表自定义统计项") +@ElogTransform(name = "统计项目") public class SalaryStatisticsItemPO implements Serializable { private static final long serialVersionUID = 5335849418826222822L; //主键id") + @ElogTransform(name = "主键id") private Long id; //统计报表id") + @ElogTransform(name = "报表id") private Long statReportId; //统计项名称") + @ElogTransform(name = "统计项名称") private String itemName; //统计项集合") + @ElogTransform(name = "统计项集合") private String itemValue; /** @@ -44,6 +50,7 @@ public class SalaryStatisticsItemPO implements Serializable { * jsonToString */ //计数规则") + @ElogTransform(name = "计数规则") private String countRule; /** @@ -60,6 +67,7 @@ public class SalaryStatisticsItemPO implements Serializable { * jsonToString */ //求和规则") + @ElogTransform(name = "求和规则") private String sumRule; /** @@ -76,6 +84,7 @@ public class SalaryStatisticsItemPO implements Serializable { * jsonToString */ //平均值规则") + @ElogTransform(name = "平均值规则") private String avgRule; /** @@ -92,6 +101,7 @@ public class SalaryStatisticsItemPO implements Serializable { * jsonToString */ //最大值规则") + @ElogTransform(name = "最大值规则") private String maxRule; /** @@ -108,6 +118,7 @@ public class SalaryStatisticsItemPO implements Serializable { * jsonToString */ //最小值规则") + @ElogTransform(name = "最小值规则") private String minRule; /** @@ -124,6 +135,7 @@ public class SalaryStatisticsItemPO implements Serializable { * jsonToString */ //中位数规则") + @ElogTransform(name = "中位数规则") private String medianRule; @@ -132,6 +144,7 @@ public class SalaryStatisticsItemPO implements Serializable { *

* "totalValue":"1", 是否使用 */ + @ElogTransform(name = "最近值是否使用") private String lastRule; /** @@ -141,6 +154,7 @@ public class SalaryStatisticsItemPO implements Serializable { * "totalValue":"1", 是否使用 * } */ + @ElogTransform(name = "最早值是否使用") private String oldRule; /** @@ -150,6 +164,7 @@ public class SalaryStatisticsItemPO implements Serializable { * "totalValue":"1", 是否使用 * } */ + @ElogTransform(name = "出现最多是否使用") private String frequentRule; /** @@ -159,9 +174,11 @@ public class SalaryStatisticsItemPO implements Serializable { * "totalValue":"1", 是否使用 * } */ + @ElogTransform(name = "平铺是否使用") private String tileRule; //顺序") + @ElogTransform(name = "顺序") private Integer indexValue; /** @@ -170,6 +187,7 @@ public class SalaryStatisticsItemPO implements Serializable { * @see UnitTypeEnum */ //统计单位") + @ElogTransform(name = "统计单位") private Integer unitType; //创建时间") diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java index cdf364f62..da04ef937 100644 --- a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java +++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java @@ -1,5 +1,6 @@ package com.engine.salary.report.entity.po; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -22,77 +23,105 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_salary_stats_report +@ElogTransform(name = "薪酬统计报表") public class SalaryStatisticsReportPO implements Serializable { private static final long serialVersionUID = 6526480959578343197L; //主键id + @ElogTransform(name = "主键id") private Long id; //报表名称 + @ElogTransform(name = "报表名称") private String reportName; + @ElogTransform(name = "备注") private String remark; + @ElogTransform(name = "二级维度") private String secondDimension; + + @ElogTransform(name = "排序列") private String sortIndex; + + @ElogTransform(name = "排序方式") private String sortType; //时间类型 + @ElogTransform(name = "时间类型") private Integer timeType; //统计维度 + @ElogTransform(name = "统计维度") private String dimension; //薪资所属月-起始 + @ElogTransform(name = "薪资所属月-起始") private Date salaryStartMonth; //薪资所属月-截止 + @ElogTransform(name = "薪资所属月-截止") private Date salaryEndMonth; //个税扣缴义务人配置 + @ElogTransform(name = "个税扣缴义务人配置") private String taxAgentSetting; //收入所得项目配置 + @ElogTransform(name = "收入所得项目配置") private String incomeCategorySetting; //分部配置 + @ElogTransform(name = "分部配置") private String subCompanySetting; //部门配置 + @ElogTransform(name = "部门配置") private String departSetting; //职级配置 + @ElogTransform(name = "职级配置") private String gradeSetting; //岗位配置 + @ElogTransform(name = "岗位配置") private String positionSetting; //人员状态配置 + @ElogTransform(name = "人员状态配置") private String statusSetting; //人员配置 + @ElogTransform(name = "人员配置") private String employeeSetting; //入职日期配置 + @ElogTransform(name = "入职日期配置") private String hiredateSetting; //离职日期配置 + @ElogTransform(name = "离职日期配置") private String leavedateSetting; //租户key + @ElogTransform(name = "租户key", ignore = true) private String tenantKey; //创建人id + @ElogTransform(name = "创建人id", ignore = true) private Long creator; //是否删除 + @ElogTransform(name = "是否删除", ignore = true) private Integer deleteType; //创建时间 + @ElogTransform(name = "创建时间", ignore = true) private Date createTime; //更新时间 + @ElogTransform(name = "更新时间", ignore = true) private Date updateTime; diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java index 41b3fb90b..176192125 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java @@ -1,7 +1,10 @@ package com.engine.salary.report.service.impl; 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.enums.OperateTypeEnum; import com.engine.salary.enums.sicategory.DeleteTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.report.SalaryStatisticsItemMapper; @@ -12,10 +15,11 @@ import com.engine.salary.report.service.SalaryStatisticsItemService; import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; -import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.db.IdGenerator; +import com.engine.salary.util.db.MapperProxyFactory; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import java.util.*; import java.util.stream.Collectors; @@ -66,15 +70,17 @@ public class SalaryStatisticsItemServiceImpl extends Service implements SalarySt List list = this.listByIds(ids); if (CollectionUtils.isNotEmpty(list)) { getSalaryStatisticsItemMapper().deleteByIds(ids); -// list.forEach(po -> { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(po.getId())); -// loggerContext.setTargetName(po.getItemName()); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(152639, "删除统计项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(152639, "删除统计项目")); -// salaryStatReportLoggerTemplate.write(loggerContext); -// }); + list.forEach(po -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(po.getId())); + loggerContext.setTargetName(po.getItemName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除统计项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除统计项目")); + loggerContext.setOldValues(po); + SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext); + }); } return StringUtils.EMPTY; } @@ -130,19 +136,24 @@ public class SalaryStatisticsItemServiceImpl extends Service implements SalarySt getSalaryStatisticsItemMapper().insertIgnoreNull(subTableItemPO); // 记录操作日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(subTableItemPO.getId())); -// loggerContext.setTargetName(subTableItemPO.getItemName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(152643, "新增统计项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(152643, "新增统计项目")); -// salaryStatReportLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(subTableItemPO.getId())); + loggerContext.setTargetName(subTableItemPO.getItemName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增统计项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增统计项目")); + loggerContext.setNewValues(subTableItemPO); + SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext); // 更新 } else { SalaryStatisticsItemPO itemPO = this.getById(saveParam.getId()); SalaryAssert.notNull(itemPO, SalaryI18nUtil.getI18nLabel(152591, "统计项目不存在")); Optional.ofNullable(saveParam.getItemName()).ifPresent(itemPO::setItemName); + SalaryStatisticsItemPO oldPO = new SalaryStatisticsItemPO(); + BeanUtils.copyProperties(itemPO, oldPO); + if (Objects.nonNull(saveParam.getUnitType())) { itemPO.setUnitType(saveParam.getUnitType()); } else { @@ -162,13 +173,16 @@ public class SalaryStatisticsItemServiceImpl extends Service implements SalarySt getSalaryStatisticsItemMapper().updateIgnoreNull(itemPO); // 记录操作日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(itemPO.getId())); -// loggerContext.setTargetName(itemPO.getItemName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(152669, "更新统计项目")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(152669, "更新统计项目")); -// salaryStatReportLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(itemPO.getId().toString()); + loggerContext.setTargetName(itemPO.getItemName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增统计项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增统计项目")); + loggerContext.setOldValues(oldPO); + loggerContext.setNewValues(itemPO); + SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext); } return StringUtils.EMPTY; } diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java index 368918f4c..60acca9fc 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java @@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.cache.SalaryCacheKey; +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.hrm.dto.EmployeeInfoExpandDTO; import com.engine.salary.entity.hrm.dto.FieldSetting; @@ -13,6 +15,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.report.SalaryStatisticsReportMapper; import com.engine.salary.report.common.constant.SalaryConstant; @@ -31,13 +34,13 @@ import com.engine.salary.report.util.ReportTimeUtil; import com.engine.salary.service.*; import com.engine.salary.service.impl.*; 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; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -194,13 +197,16 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary this.getSalaryStatisticsReportMapper().updateIgnoreNull(poNew); // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(poNew.getId())); -// loggerContext.setTargetName(poNew.getReportName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 152565, "更新报表")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 152565, "更新报表")); -// 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)) { @@ -211,13 +217,15 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary getSalaryStatisticsReportMapper().insertIgnoreNull(poNew); // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(poNew.getId())); -// loggerContext.setTargetName(poNew.getReportName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 152561, "新增报表")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 152561, "新增报表")); -// 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; } @@ -233,6 +241,8 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary } SalaryStatisticsReportPO po = getById(param.getId()); + SalaryStatisticsReportPO oldPO = new SalaryStatisticsReportPO(); + BeanUtils.copyProperties(po, oldPO); SalaryAssert.notNull(po, SalaryI18nUtil.getI18nLabel(152563, "报表不存在")); po.setSalaryStartMonth(param.getSalaryStartMonth()); po.setSalaryEndMonth(param.getSalaryEndMonth()); @@ -286,13 +296,16 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary getSalaryStatisticsItemService(user).saveOrUpdateBatch(salaryStatisticsItemList); //记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(po.getId())); -// loggerContext.setTargetName(po.getReportName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(// 152565, "更新报表")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(// 152565, "更新报表")); -// 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; } @@ -311,16 +324,17 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary getSalaryStatisticsReportMapper().deleteByIds(deleteIds); //删除薪资项 getSalaryStatisticsItemService(user).deleteByReportIds(deleteIds); -// list.forEach(e -> { -// // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(e.getId())); -// loggerContext.setTargetName(e.getReportName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 153162, "删除报表")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 153162, "删除报表")); -// 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); @@ -366,6 +380,17 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary return item; }).collect(Collectors.toList()); getSalaryStatisticsItemService(user).saveOrUpdateBatch(itemList); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + 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.setNewValues(po); + SalaryElogConfig.salaryStatReportLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/AttendQuoteService.java b/src/com/engine/salary/service/AttendQuoteService.java index 7e06ec6e5..d871b026c 100644 --- a/src/com/engine/salary/service/AttendQuoteService.java +++ b/src/com/engine/salary/service/AttendQuoteService.java @@ -2,6 +2,7 @@ package com.engine.salary.service; import com.engine.salary.entity.datacollection.dto.AttendQuoteListDTO; import com.engine.salary.entity.datacollection.param.AttendQuoteQueryParam; +import com.engine.salary.entity.datacollection.po.AttendQuotePO; import com.engine.salary.util.page.PageInfo; import java.time.YearMonth; @@ -35,4 +36,6 @@ public interface AttendQuoteService { */ Boolean checkOperation(YearMonth salaryYearMonth, Long salarySobId); + AttendQuotePO getById(Long id); + } diff --git a/src/com/engine/salary/service/SalaryItemService.java b/src/com/engine/salary/service/SalaryItemService.java index c42079fa3..ba661cc27 100644 --- a/src/com/engine/salary/service/SalaryItemService.java +++ b/src/com/engine/salary/service/SalaryItemService.java @@ -99,7 +99,7 @@ public interface SalaryItemService { * * @param saveParam 保存参数 */ - void save(SalaryItemSaveParam saveParam); + SalaryItemPO save(SalaryItemSaveParam saveParam); /** * 批量保存 @@ -113,7 +113,7 @@ public interface SalaryItemService { * * @param saveParam 更新参数 */ - void update(SalaryItemSaveParam saveParam); + SalaryItemPO update(SalaryItemSaveParam saveParam); /** * 根据主键id删除薪资项目 diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 4c3eef869..30aad6422 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -392,7 +392,6 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction apidatas.put("successCount", successCount); apidatas.put("errorCount", errorCount); apidatas.put("errorData", errorData); - } finally { IOUtils.closeQuietly(fileInputStream); } @@ -439,19 +438,31 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction if (CollectionUtils.isNotEmpty(saveList)) { addUpDeductionBiz.batchSave(saveList); } - // 记录操作日志 - saveList.addAll(updateList); - if (CollectionUtils.isNotEmpty(saveList)) { + // 记录操作日志 + // 根据月份、人员id查出保存的数据 + List empIds = saveList.stream().map(AddUpDeduction::getEmployeeId).collect(Collectors.toList()); + List insertList = addUpDeductionBiz.listSome(AddUpDeduction.builder().declareMonth(po.getDeclareMonth()).employeeIds(empIds).build()); + Map insertMap = SalaryEntityUtil.convert2Map(insertList, p -> p.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(p.getDeclareMonth()) + "-" + p.getEmployeeId()); + saveList.forEach(save -> { + AddUpDeduction addUpDeduction = insertMap.get(save.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(save.getDeclareMonth()) + "-" + save.getEmployeeId()); + if (addUpDeduction != null) { + updateList.add(addUpDeduction); + } + }); + + if (CollectionUtils.isNotEmpty(updateList)) { + String formatYearMonth = SalaryDateUtil.getFormatYearMonth(po.getDeclareMonth()); LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "累计专项附加扣除 ") + formatYearMonth); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); - loggerContext.setNewValueList(saveList); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导入累计专项附加扣除 ") + formatYearMonth); + loggerContext.setNewValueList(updateList); SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); } + } @Override @@ -484,9 +495,24 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction } } ArrayList updateList = new ArrayList<>(); - AddUpDeduction build = AddUpDeduction.builder().id(addUpDeduction.getId()).addUpChildEducation(addUpDeduction.getAddUpChildEducation()).addUpContinuingEducation(addUpDeduction.getAddUpContinuingEducation()).addUpHousingLoanInterest(addUpDeduction.getAddUpHousingLoanInterest()).addUpHousingRent(addUpDeduction.getAddUpHousingRent()).addUpSupportElderly(addUpDeduction.getAddUpSupportElderly()).addUpIllnessMedical(addUpDeduction.getAddUpIllnessMedical()).addUpInfantCare(addUpDeduction.getAddUpInfantCare()).build(); + AddUpDeduction build = AddUpDeduction.builder().id(addUpDeduction.getId()).addUpChildEducation(addUpDeduction.getAddUpChildEducation()).addUpContinuingEducation(addUpDeduction.getAddUpContinuingEducation()).addUpHousingLoanInterest(addUpDeduction.getAddUpHousingLoanInterest()).addUpHousingRent(addUpDeduction.getAddUpHousingRent()).addUpSupportElderly(addUpDeduction.getAddUpSupportElderly()).addUpIllnessMedical(addUpDeduction.getAddUpIllnessMedical()).addUpInfantCare(addUpDeduction.getAddUpInfantCare()).createTime(new Date()).build(); updateList.add(build); addUpDeductionBiz.batchUpdate(updateList); + + // 记录日志 + AddUpDeduction newValue = addUpDeductionBiz.getById(build.getId()); + String name = SalaryI18nUtil.getI18nLabel(0, "编辑"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(addUpDeduction.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + addUpDeduction.getId()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "编辑")); + loggerContext.setOldValues(byId); + loggerContext.setNewValues(newValue); + loggerContext.setUser(user); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); } @Override @@ -589,6 +615,19 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction handleImportData(insertData); } + private void addLogger4Insert(Integer currentEmployeeId, AddUpDeduction addUpDeduction, String targetName) { + String name = SalaryI18nUtil.getI18nLabel(0, "新增") + SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(addUpDeduction.getId().toString()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(name); + loggerContext.setNewValues(addUpDeduction); + loggerContext.setOperator(currentEmployeeId.toString()); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + } + @Override public void deleteSelectAddUpDeduction(AddUpDeductionRecordDeleteParam deleteParam) { long currentEmployeeId = user.getUID(); @@ -602,9 +641,11 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction List salaryAcctEmployees = getAccountedEmployeeDataByTaxYearMonth(declareMonthStr); // 判断是否有核算过 List deleteList = new ArrayList<>(); + ArrayList oldAddUpDeductions = new ArrayList<>(); for (int i = 0; i < deleteIds.size(); i++) { Long id = deleteIds.get(i); AddUpDeduction byId = addUpDeductionBiz.getById(id); + if (byId == null) { throw new SalaryRunTimeException("数据不存在或已被删除！"); } @@ -621,8 +662,25 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction } } deleteList.add(byId.getId()); + oldAddUpDeductions.add(byId); } addUpDeductionBiz.batchDeleteByIDS(deleteList); + + //记录日志 + if (CollectionUtils.isNotEmpty(oldAddUpDeductions)) { + oldAddUpDeductions.stream().forEach( e -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(e.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + e.getId()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "删除")); + loggerContext.setOldValues(e); + loggerContext.setUser(user); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + }); + } } @Override @@ -668,6 +726,20 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction } List deleteIds = list.stream().map(AddUpDeductionDTO::getId).collect(Collectors.toList()); addUpDeductionBiz.batchDeleteByIDS(deleteIds); + + // 记录日志 + Collection finalTaxAgentIds = queryParam.getTaxAgentIds(); + List taxAgentNames = taxAgentList.stream().filter(t -> finalTaxAgentIds.contains(t.getTaxAgentId())) + .map(TaxAgentManageRangeEmployeeDTO::getTaxAgentName).collect(Collectors.toList()); + String name = declareMonthStr + " " + StringUtils.join(taxAgentNames, ","); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(name); + loggerContext.setOperateType(OperateTypeEnum.CLEAR.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "一键清空")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "一键清空：") + name); + loggerContext.setUser(user); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); } @Override @@ -788,6 +860,31 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction .forEach(l -> getAddUpDeductionMapper().insertData((List) l)); Lists.partition(updateList, 100) .forEach(l -> getAddUpDeductionMapper().updateDataAndDeclareMonth((List) l)); + + // 记录日志 + // 根据月份、人员id查出保存的数据 + List empIds = insertList.stream().map(AddUpDeduction::getEmployeeId).collect(Collectors.toList()); + List insertLogList = getAddUpDeductionMapper().listSome(AddUpDeduction.builder().declareMonth(yearMonth).employeeIds(empIds).build()); + Map insertMap = SalaryEntityUtil.convert2Map(insertLogList, p -> p.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(p.getDeclareMonth()) + "-" + p.getEmployeeId()); + insertList.forEach(save -> { + AddUpDeduction addUpDeduction = insertMap.get(save.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(save.getDeclareMonth()) + "-" + save.getEmployeeId()); + if (addUpDeduction != null) { + updateList.add(addUpDeduction); + } + }); + + if (CollectionUtils.isNotEmpty(updateList)) { + String yearMonthStr = SalaryDateUtil.getFormatYearMonth(yearMonth); + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "一键累计 "+yearMonthStr)); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "一键累计专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "一键累计 "+ yearMonthStr +" 专项附加扣除")); + loggerContext.setNewValueList(updateList); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + } + if (!errorMessages.isEmpty()) { String userNames = getSalaryEmployeeService(user) .getEmployeeByIdsAll(errorMessages) @@ -980,6 +1077,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //获取操作按钮资源 List> rowList = getExcelRowDetailList(isChief, queryParam); + //获取excel return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除明细"); } @@ -1149,6 +1247,16 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //获取操作按钮资源 List> rowList = getExcelRowList(isChief, queryParam); + // 记录日志 + String name = SalaryI18nUtil.getI18nLabel(0, "导出"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除")); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + name); + loggerContext.setUser(user); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + //获取excel return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除"); } diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index bbeb0506b..43871ca44 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -259,10 +259,20 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation @Override public XSSFWorkbook export(AddUpSituationQueryParam queryParam) { - //获取操作按钮资源 + // 获取操作按钮资源 List> rowList = getExcelRowList(queryParam); - //获取excel + // 记录日志 + String name = SalaryI18nUtil.getI18nLabel(0, "导出"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "往期累计情况")); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "往期累计情况") + "-" + name); + loggerContext.setUser(user); + SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); + + // 获取excel return ExcelUtil.genWorkbook(rowList, "累计情况"); } @@ -870,17 +880,27 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation if (CollectionUtils.isNotEmpty(saveList)) { batchSave(saveList); } -// 记录操作日志 - saveList.addAll(updateList); - if (CollectionUtils.isNotEmpty(saveList)) { + // 记录操作日志 + // 根据月份、人员id查出保存的数据 + List empIds = saveList.stream().map(AddUpSituation::getEmployeeId).collect(Collectors.toList()); + List insertList = biz.listSome(AddUpSituation.builder().taxYearMonth(po.getTaxYearMonth()).employeeIds(empIds).build()); + Map insertMap = SalaryEntityUtil.convert2Map(insertList, p -> p.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(p.getTaxYearMonth()) + "-" + p.getEmployeeId()); + saveList.forEach(save -> { + AddUpSituation addUpSituation = insertMap.get(save.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(save.getTaxYearMonth()) + "-" + save.getEmployeeId()); + if (addUpSituation != null) { + updateList.add(addUpSituation); + } + }); + + if (CollectionUtils.isNotEmpty(updateList)) { LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "往期累计情况")); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除")); - loggerContext.setNewValueList(saveList); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导入往期累计情况")); + loggerContext.setNewValueList(updateList); SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); } } @@ -958,6 +978,21 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation .build(); updateList.add(build); biz.batchUpdate(updateList); + + // 记录日志 + AddUpSituation newValue = biz.getById(build.getId()); + String name = SalaryI18nUtil.getI18nLabel(0, "编辑"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(newValue.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "往期累计情况") + "-" + newValue.getId()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "往期累计情况") + "-" + SalaryI18nUtil + .getI18nLabel(0, "编辑")); + loggerContext.setOldValues(byId); + loggerContext.setNewValues(newValue); + loggerContext.setUser(user); + SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); } /** @@ -1112,6 +1147,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation String format = salaryMonthDate.atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM")); List salaryAcctEmployees = getAddUpDeductionService(user).getAccountedEmployeeData(format); // 判断是否有核算过 + List deletePOList = new ArrayList<>(); List deleteList = new ArrayList<>(); for (int i = 0; i < deleteIds.size(); i++) { Long id = deleteIds.get(i); @@ -1132,8 +1168,23 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } } deleteList.add(byId.getId()); + deletePOList.add(byId); } biz.batchDeleteByIDS(deleteList); + + // 记录日志 + deletePOList.stream().forEach(po -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(po.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "往期累计情况") + "-" + po.getId()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "往期累计情况") + "-" + SalaryI18nUtil + .getI18nLabel(0, "删除")); + loggerContext.setOldValues(po); + loggerContext.setUser(user); + SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); + }); } @Override @@ -1183,6 +1234,20 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } List deleteIds = list.stream().map(AddUpSituation::getId).collect(Collectors.toList()); biz.batchDeleteByIDS(deleteIds); + + // 记录日志 + Collection finalTaxAgentIds = queryParam.getTaxAgentIds(); + List taxAgentNames = taxAgentList.stream().filter(t -> finalTaxAgentIds.contains(t.getTaxAgentId())) + .map(TaxAgentManageRangeEmployeeDTO::getTaxAgentName).collect(Collectors.toList()); + String name = declareMonthStr + " " + StringUtils.join(taxAgentNames, ","); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(name); + loggerContext.setOperateType(OperateTypeEnum.CLEAR.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "一键清空")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "往期累计情况") + "-" + SalaryI18nUtil + .getI18nLabel(0, "一键清空：") + name); + loggerContext.setUser(user); + SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index 8e9f4282a..6f968642e 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -8,9 +8,14 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.biz.*; +import com.engine.salary.biz.AttendQuoteBiz; +import com.engine.salary.biz.AttendQuoteDataBiz; +import com.engine.salary.biz.AttendQuoteDataValueBiz; +import com.engine.salary.biz.AttendQuoteFieldBiz; import com.engine.salary.common.LocalDateRange; +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.datacollection.bo.AttendQuoteDataBO; import com.engine.salary.entity.datacollection.dto.*; @@ -24,6 +29,7 @@ import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; import com.engine.salary.entity.salarysob.param.SalarySobRangeEmpQueryParam; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.salarysob.po.SalarySobRangePO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.datacollection.AttendQuoteSourceTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -34,10 +40,7 @@ import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.remote.attend.entity.Attend4Salary; import com.engine.salary.remote.attend.service.RemoteAttend4SalaryService; import com.engine.salary.remote.attend.service.impl.RemoteAttend4SalaryServiceImpl; -import com.engine.salary.service.AttendQuoteDataService; -import com.engine.salary.service.AttendQuoteFieldSettingService; -import com.engine.salary.service.SalaryEmployeeService; -import com.engine.salary.service.SalarySobService; +import com.engine.salary.service.*; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.service.SalarySysConfService; @@ -45,6 +48,7 @@ import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; 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.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; @@ -55,7 +59,6 @@ import com.engine.salary.util.valid.ValidUtil; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -104,6 +107,10 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa return ServiceUtil.getService(SalarySobServiceImpl.class, user); } + private AttendQuoteService getAttendQuoteService(User user) { + return ServiceUtil.getService(AttendQuoteServiceImpl.class, user); + } + private AttendQuoteDataMapper getAttendQuoteDataMapper() { return MapperProxyFactory.getProxy(AttendQuoteDataMapper.class); } @@ -265,6 +272,20 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa } rows.add(row); } + + // 记录日志 + AttendQuotePO attendQuotePO = getAttendQuoteService(user).getById(queryParam.getAttendQuoteId()); + SalarySobPO salarySob = getSalarySobService(user).getById(attendQuotePO.getSalarySobId()); + + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(attendQuotePO.getId())); + loggerContext.setTargetName(SalaryDateUtil.getFormatYearMonth(attendQuotePO.getSalaryYearMonth()) + " " + (salarySob != null ? salarySob.getName() : "")); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导出考勤数据")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "考勤数据")); + SalaryElogConfig.attendQuoteLoggerTemplate.write(loggerContext); + return ExcelUtil.genWorkbookV2(rows, sheetName); } @@ -370,15 +391,30 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa // 6.数据落库处理 handleDataToDB(attendQuote.getId(), pos, values); + // 记录日志 + recordLog(attendQuote); } else { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100368, "暂无考勤数据可以同步")); } - - // todo 记录日志 -// recordLog(attendQuote, currentEmployeeId, currentTenantKey, null); return null; } + private void recordLog(AttendQuotePO attendQuote) { + SalarySobPO salarySob = getSalarySobService(user).getById(attendQuote.getSalarySobId()); + String sourceType = AttendQuoteSourceTypeEnum.getDefaultLabelByValue(attendQuote.getSourceType()); + + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(attendQuote.getId())); + loggerContext.setTargetName(SalaryDateUtil.getFormatYearMonth(attendQuote.getSalaryYearMonth()) + " " + (salarySob != null ? salarySob.getName() : "")); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(sourceType + SalaryI18nUtil.getI18nLabel(0, "考勤数据")); + loggerContext.setOperatedesc(sourceType + SalaryI18nUtil.getI18nLabel(0, "考勤数据")); + loggerContext.setNewValues(attendQuote); + SalaryElogConfig.attendQuoteLoggerTemplate.write(loggerContext); + } + + /** * 获取考勤引用 * @@ -769,8 +805,8 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa handleDataToDB(attendQuote.getId(), pos, values); - // todo 记录日志 -// recordLog(attendQuote, message.getUserId(), message.getTenantKey(), message.getClientIp()); + // 记录日志 + recordLog(attendQuote); Map apidatas = new HashMap(); apidatas.put("successCount", successCount); @@ -882,35 +918,6 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa return bigDecimalVal == null ? "" : bigDecimalVal.toString(); } -// /** -// * 记录日志 -// * @param attendQuote -// * @param currentEmployeeId -// * @param currentTenantKey -// * @param clientIp -// */ -// private void recordLog(AttendQuotePO attendQuote, Long currentEmployeeId, String currentTenantKey, String clientIp) { -// List salarySobs = new LambdaQueryChainWrapper<>(getSalarySobMapper()) -// .eq(SalarySobPO::getTenantKey, TenantContext.getCurrentTenantKey()) -// .eq(SalarySobPO::getDeleteType, 0) -// .eq(SalarySobPO::getId, attendQuote.getSalarySobId()) -// .list(); -// String sourceType = AttendQuoteSourceTypeEnum.getDefaultLabelByValue(attendQuote.getSourceType(), currentEmployeeId, currentTenantKey); -// -// LoggerContext loggerContext = new LoggerContext(); -// loggerContext.setTargetId(String.valueOf(attendQuote.getId())); -// loggerContext.setTargetName(SalaryDateUtil.getFormatYearMonth(attendQuote.getSalaryYearMonth())+" "+(CollectionUtils.isNotEmpty(salarySobs)?salarySobs.get(0).getName():"")); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(sourceType+SalaryI18nUtil.getI18nLabel(93931, "考勤数据")); -// loggerContext.setOperatedesc(sourceType+SalaryI18nUtil.getI18nLabel( 93931, "考勤数据")); -// loggerContext.setNewValues(attendQuote); -// loggerContext.setTenant_key(currentTenantKey); -// loggerContext.setOperator(currentEmployeeId.toString()); -// if (StringUtils.isNotEmpty(clientIp)) { -// loggerContext.setClientIp(clientIp); -// } -// attendQuoteLoggerTemplate.write(loggerContext); -// } /** * 检查参数 diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java index 3979c3180..37d3ff3f6 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java @@ -5,10 +5,13 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.AttendQuoteFieldBiz; import com.engine.salary.component.SalaryWeaTable; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO; import com.engine.salary.entity.datacollection.param.AttendQuoteFieldQueryParam; import com.engine.salary.entity.datacollection.param.AttendQuoteFieldSaveParam; import com.engine.salary.entity.datacollection.po.AttendQuoteFieldPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.datacollection.AttendQuoteFieldSourceTypeEnum; import com.engine.salary.enums.datacollection.AttendQuoteFieldTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -16,6 +19,7 @@ import com.engine.salary.mapper.datacollection.AttendQuoteFieldMapper; import com.engine.salary.remote.attend.service.RemoteAttend4SalaryService; import com.engine.salary.remote.attend.service.impl.RemoteAttend4SalaryServiceImpl; import com.engine.salary.service.AttendQuoteFieldService; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -142,6 +146,17 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF // 保存 biz.save(attendQuoteField); + // 记录日志 + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(attendQuoteField.getId())); + loggerContext.setTargetName(attendQuoteField.getFieldName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建自定义字段")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建自定义字段")); + loggerContext.setNewValues(attendQuoteField); + SalaryElogConfig.attendQuoteFieldLoggerTemplate.write(loggerContext); + return null; } @@ -222,6 +237,18 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF newAttendQuoteField.setUpdateTime(new Date()); // 更新 biz.update(newAttendQuoteField); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(attendQuoteField.getId())); + loggerContext.setTargetName(attendQuoteField.getFieldName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "启用/停用自定义字段")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "启用/停用自定义字段")); + loggerContext.setOldValues(attendQuoteField); + loggerContext.setNewValues(newAttendQuoteField); + SalaryElogConfig.attendQuoteFieldLoggerTemplate.write(loggerContext); return null; } diff --git a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java index 7f4b96a60..9a5878b0b 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteServiceImpl.java @@ -5,10 +5,12 @@ import com.engine.core.impl.Service; import com.engine.salary.biz.AttendQuoteBiz; import com.engine.salary.biz.AttendQuoteDataBiz; import com.engine.salary.biz.AttendQuoteDataValueBiz; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.entity.datacollection.dto.AttendQuoteListDTO; import com.engine.salary.entity.datacollection.param.AttendQuoteDataQueryParam; import com.engine.salary.entity.datacollection.param.AttendQuoteQueryParam; import com.engine.salary.entity.datacollection.po.AttendQuoteDataPO; +import com.engine.salary.entity.datacollection.po.AttendQuotePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; @@ -20,6 +22,8 @@ import com.engine.salary.service.SalarySobService; import com.engine.salary.service.TaxAgentService; import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.SalaryLoggerUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -130,17 +134,18 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic dataValueBiz.deleteByAttendQuoteDataIds(attendQuoteDataIds); } - //todo 日志 -// attendQuotes.forEach(e -> { -// SalaryLoggerUtil.recordDeleteSingleLog(attendQuoteLoggerTemplate, -// e.getId(), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85367, "考勤引用"), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100412, "删除考勤引用"), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100412, "删除考勤引用") + -// "：[" + SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 87614, "薪资所属月") + "：" + e.getSalaryYearMonth() + "，" + -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 87615, "关联账套") + "：" + e.getSalarySobName() + "]", -// e); -// }); + // 记录日志 + attendQuotes.forEach(e -> { + SalaryLoggerUtil.recordDeleteSingleLog(SalaryElogConfig.attendQuoteLoggerTemplate, + e.getId(), + SalaryI18nUtil.getI18nLabel(0, SalaryDateUtil.getFormatYearMonth(e.getSalaryYearMonth()) + " " + e.getSalarySobName()), + SalaryI18nUtil.getI18nLabel(0, "删除考勤引用"), + SalaryI18nUtil.getI18nLabel(0, "删除考勤引用") + + "：[" + SalaryI18nUtil.getI18nLabel(0, "薪资所属月") + "：" + e.getSalaryYearMonth() + "，" + + SalaryI18nUtil.getI18nLabel(0, "关联账套") + "：" + e.getSalarySobName() + "]", + e, + user); + }); return null; } @@ -161,5 +166,11 @@ public class AttendQuoteServiceImpl extends Service implements AttendQuoteServic return isEnableOperation.get(); } - + @Override + public AttendQuotePO getById(Long id) { + if (id == null) { + return null; + } + return getAttendQuoteMapper().getById(id); + } } diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index b831a5463..0d8d4669b 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -9,6 +9,7 @@ import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; +import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.OtherDeductionListDTO; import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO; @@ -361,7 +362,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } //入库 - OtherDeductionBiz.handleImportData(eligibleData); + OtherDeductionBiz.handleImportData(eligibleData, user); apidatas.put("successCount", successCount); apidatas.put("errorCount", errorCount); @@ -418,18 +419,27 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction if (CollectionUtils.isNotEmpty(saveList)) { otherDeductionBiz.batchSave(saveList); } - // 记录操作日志 - saveList.addAll(updateList); + // 记录日志 + // 根据月份、人员id查出保存的数据 + List empIds = saveList.stream().map(OtherDeductionPO::getEmployeeId).collect(Collectors.toList()); + List insertList = otherDeductionBiz.listSome(OtherDeductionPO.builder().declareMonth(po.getDeclareMonth()).employeeIds(empIds).build()); + Map insertMap = SalaryEntityUtil.convert2Map(insertList, p -> p.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(p.getDeclareMonth()) + "-" + p.getEmployeeId()); + saveList.forEach(save -> { + OtherDeductionPO otherDeductionPO = insertMap.get(save.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(save.getDeclareMonth()) + "-" + save.getEmployeeId()); + if (otherDeductionPO != null) { + updateList.add(otherDeductionPO); + } + }); - if (CollectionUtils.isNotEmpty(saveList)) { - LoggerContext loggerContext = new LoggerContext(); + if (CollectionUtils.isNotEmpty(updateList)) { + LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "新增累计专项附加扣除")); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "其他免税扣除")); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "新增计专项附加扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "新增累计专项附加扣除")); - loggerContext.setNewValueList(saveList); - SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "新增")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "新增其他免税扣除")); + loggerContext.setNewValueList(updateList); + SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); } } @@ -461,6 +471,16 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction //获取操作按钮资源 List> rowList = getExcelRowList(param); + // 记录日志 + String name = SalaryI18nUtil.getI18nLabel(0, "导出"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除")); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除") + "-" + name); + loggerContext.setUser(user); + SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); + //获取excel return ExcelUtil.genWorkbook(rowList, "其他免税扣除"); } @@ -655,6 +675,21 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction .build(); updateList.add(build); OtherDeductionBiz.batchUpdate(updateList); + + // 记录日志 + OtherDeductionPO newValue = OtherDeductionBiz.getById(build.getId()); + String name = SalaryI18nUtil.getI18nLabel(0, "编辑"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(newValue.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除") + "-" + newValue.getId()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "编辑")); + loggerContext.setOldValues(byId); + loggerContext.setNewValues(newValue); + loggerContext.setUser(user); + SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); } @Override @@ -755,6 +790,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction List salaryAcctEmployees = getAddUpDeductionService(user).getAccountedEmployeeData(declareMonthStr); // 判断是否有核算过 List deleteList = new ArrayList<>(); + List resultList = new ArrayList<>(); for (int i = 0; i < deleteIds.size(); i++) { Long id = deleteIds.get(i); OtherDeductionPO byId = otherDeductionBiz.getById(id); @@ -774,8 +810,22 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } } deleteList.add(byId.getId()); + resultList.add(byId); } otherDeductionBiz.batchDeleteByIDS(deleteList); + // 记录日志 + resultList.stream().forEach(r -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(r.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除") + "-" + r.getId()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "删除")); + loggerContext.setOldValues(r); + loggerContext.setUser(user); + SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); + }); } @Override @@ -822,6 +872,20 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } List deleteIds = list.stream().map(OtherDeductionPO::getId).collect(Collectors.toList()); otherDeductionBiz.batchDeleteByIDS(deleteIds); + + // 记录日志 + Collection finalTaxAgentIds = queryParam.getTaxAgentIds(); + List taxAgentNames = taxAgentList.stream().filter(t -> finalTaxAgentIds.contains(t.getTaxAgentId())) + .map(TaxAgentManageRangeEmployeeDTO::getTaxAgentName).collect(Collectors.toList()); + String name = declareMonthStr + " " + StringUtils.join(taxAgentNames, ","); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(name); + loggerContext.setOperateType(OperateTypeEnum.CLEAR.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "一键清空")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "一键清空：") + name); + loggerContext.setUser(user); + SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); } @Override @@ -906,6 +970,31 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction getOtherDeductionBiz().batchSave(insertInfo); getOtherDeductionBiz().batchUpdate(updatetInfo); + + //记录日志 + // 根据月份、人员id查出保存的数据 + List empIds = insertInfo.stream().map(OtherDeductionPO::getEmployeeId).collect(Collectors.toList()); + List insertList = getOtherDeductionBiz().listSome(OtherDeductionPO.builder().declareMonth(SalaryDateUtil.stringToDate(param.getDeclareMonth())).employeeIds(empIds).build()); + Map insertMap = SalaryEntityUtil.convert2Map(insertList, p -> p.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(p.getDeclareMonth()) + "-" + p.getEmployeeId()); + insertList.forEach(save -> { + OtherDeductionPO otherDeductionPO = insertMap.get(save.getTaxAgentId() + "-" + SalaryDateUtil.getFormatYearMonth(save.getDeclareMonth()) + "-" + save.getEmployeeId()); + if (otherDeductionPO != null) { + updatetInfo.add(otherDeductionPO); + } + }); + + if (CollectionUtils.isNotEmpty(updatetInfo)) { + String yearMonthStr = SalaryDateUtil.getFormatYearMonth(lastMonth.toLocalDate()) ; + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "沿用上月 "+yearMonthStr)); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "沿用上月其他免税扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "沿用上月 "+ yearMonthStr +" 其他免税扣除")); + loggerContext.setNewValueList(updatetInfo); + SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); + } + return ""; } diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 964837f26..9a2be0a97 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -41,10 +41,7 @@ import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.enums.OpenEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; -import com.engine.salary.util.JsonUtil; -import com.engine.salary.util.SalaryDateUtil; -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.ExcelSupport; @@ -64,6 +61,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.BeanUtils; import weaver.file.ImageFileManager; import weaver.hrm.User; @@ -156,6 +154,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc public XSSFWorkbook exportSalaryAcctEmployee(SalaryAcctEmployeeQueryParam queryParam) { ValidUtil.doValidator(queryParam); + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); + if (salaryAcctRecordPO == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"薪资核算记录不存在或已被删除")); + } // 1.工作簿名称 String sheetName = SalaryI18nUtil.getI18nLabel(85368, "核算人员范围"); // 2.表头 @@ -180,6 +182,18 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 3.表数据 List> lists = convert2ExcelRow(salaryAcctEmployees); rows.addAll(lists); + + // 记录日志 + SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + SalaryLoggerUtil.recordExportSingleLog(SalaryElogConfig.salaryAcctRecordLoggerTemplate, + queryParam.getSalaryAcctRecordId(), + targetName, + SalaryI18nUtil.getI18nLabel(0, "导出薪资核算人员"), + SalaryI18nUtil.getI18nLabel(0, "导出薪资核算人员") + ":" + targetName, + user + ); + // return ExcelUtil.genWorkbookV2(rows, sheetName); return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } @@ -188,6 +202,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc @Override public XSSFWorkbook exportReducedEmployee(SalaryAcctEmployeeQueryParam queryParam) { ValidUtil.doValidator(queryParam); + SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); + if (salaryAcctRecordPO == null) { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "薪资核算记录不存在或已被删除")); + } // 1.工作簿名称 String sheetName = SalaryI18nUtil.getI18nLabel(85368, "环比上月减少人员"); @@ -213,6 +231,18 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 3.表数据 List> lists = convert2ExcelRow(salaryAcctEmployees); rows.addAll(lists); + + // 记录日志 + SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + SalaryLoggerUtil.recordExportSingleLog(SalaryElogConfig.salaryAcctRecordLoggerTemplate, + queryParam.getSalaryAcctRecordId(), + targetName, + SalaryI18nUtil.getI18nLabel(0, "导出环比上月减少人员"), + SalaryI18nUtil.getI18nLabel(0, "导出环比上月减少人员") + ":" + targetName, + user + ); + // return ExcelUtil.genWorkbookV2(rows, sheetName); return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } @@ -384,6 +414,18 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc rows.add(row); } + // 记录日志 + SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + SalaryLoggerUtil.recordExportSingleLog(SalaryElogConfig.salaryAcctRecordLoggerTemplate, + queryParam.getSalaryAcctRecordId(), + targetName, + SalaryI18nUtil.getI18nLabel(0, "导出薪资核算结果"), + SalaryI18nUtil.getI18nLabel(0, "导出薪资核算结果") + ":" + targetName, + user + ); + + String sheetName = "薪资核算结果"; // return ExcelUtil.genWorkbookV2(rows, sheetName, total); return ExcelUtilPlus.genWorkbookWithChildTitleColumnWithExcelFormat(rows, sheetName, total); @@ -790,6 +832,17 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc rows.add(row); } + // 记录日志 + SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + SalaryLoggerUtil.recordExportSingleLog(SalaryElogConfig.salaryAcctRecordLoggerTemplate, + queryParam.getSalaryAcctRecordId(), + targetName, + SalaryI18nUtil.getI18nLabel(0, "导出线下对比结果"), + SalaryI18nUtil.getI18nLabel(0, "导出线下对比结果") + ":" + targetName, + user + ); + String sheetName = "线下对比结果"; // return ExcelUtil.genWorkbookV2(rows, sheetName); @@ -1287,7 +1340,28 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc if (CollectionUtils.isNotEmpty(salaryAcctResults)) { // 处理导入薪资项的回算值 handleOriginResultValue(deleteResults, salaryAcctResults); + // 备份一份加密前的值 + List list4log = new ArrayList<>(); + salaryAcctResults.stream().forEach(source -> { + SalaryAcctResultPO target = new SalaryAcctResultPO(); + BeanUtils.copyProperties(source,target); + list4log.add(target); + }); getSalaryAcctResultService(user).batchSave(salaryAcctResults); + + // 记录操作日志 TODO 这里的数据没有id，id是自增的重新查数据太多效率太低 + SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); + String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(param.getSalaryAcctRecordId().toString()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_IMPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "导入薪资核算数据")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "导入薪资核算数据 ") + targetName); + loggerContext.setOldValueList(list4log); + SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); + // 存储薪资核算结果数据来源日志 new Thread() { public void run() { diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java index 001f5ee36..e4cecc326 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java @@ -3,8 +3,10 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.*; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SalaryItemConstant; +import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveExcelBO; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveInitImportDTO; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO; @@ -29,6 +31,7 @@ import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.SalaryLoggerUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelComment; import com.engine.salary.util.excel.ExcelParseHelper; @@ -823,7 +826,8 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch List taxAgentRanges = importHandleParam.getTaxAgentRanges(); List salaryArchiveSobSaves = importHandleParam.getSalaryArchiveSobSaves(); - + Map empMap = SalaryEntityUtil.convert2Map(importHandleParam.getEmployees(), DataCollectionEmployee::getEmployeeId, DataCollectionEmployee::getUsername); + Map taxAgentMap = SalaryEntityUtil.convert2Map(importHandleParam.getTaxAgentList(), TaxAgentManageRangeEmployeeDTO::getTaxAgentId, TaxAgentManageRangeEmployeeDTO::getTaxAgentName); // 新增薪资档案 if (CollectionUtils.isNotEmpty(salaryArchiveSaves)) { // 去除已经存在的，避免重复 @@ -836,8 +840,24 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch } // 修改薪资档案 if (CollectionUtils.isNotEmpty(salaryArchiveUpdates)) { + // 查询更新前档案信息 + List oldArchive = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(salaryArchiveUpdates.stream().map(SalaryArchivePO::getId).collect(Collectors.toList())).build()); + Map oldArchiveMap = SalaryEntityUtil.convert2Map(oldArchive, SalaryArchivePO::getId); // 薪资档案 salaryArchiveMapper.batchUpdate(salaryArchiveUpdates); + // 记录日志 + salaryArchiveUpdates.stream().forEach(a -> { + SalaryArchivePO oldPO = oldArchiveMap.getOrDefault(a.getId(), SalaryArchivePO.builder().build()); + String name = taxAgentMap.getOrDefault(a.getTaxAgentId(), StringUtils.EMPTY) + "-" + empMap.getOrDefault(a.getEmployeeId(), StringUtils.EMPTY); + SalaryLoggerUtil.recordUpdateSingleLog(SalaryElogConfig.salaryArchiveLoggerTemplate, + a.getId(), + name, + SalaryI18nUtil.getI18nLabel(0, "薪资档案导入更新"), + SalaryI18nUtil.getI18nLabel(0, "薪资档案导入更新") + name, + oldPO, + a, + user); + }); } // 薪资档案-薪资项目 if (CollectionUtils.isNotEmpty(salaryArchiveItemDelSalaryItemIds)) { @@ -845,7 +865,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch } // 薪资档案-薪资项目 if (CollectionUtils.isNotEmpty(salaryArchiveItemSaves)) { - salaryArchiveItemMapper.batchInsert(salaryArchiveItemSaves); + salaryArchiveItemMapper.batchInsert(salaryArchiveItemSaves, user); } // 薪资档案-薪资账套 diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java index f323b1c9d..19c39e199 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java @@ -5,6 +5,7 @@ import com.engine.core.impl.Service; import com.engine.salary.biz.SalaryArchiveBiz; import com.engine.salary.biz.SalaryArchiveItemBiz; import com.engine.salary.biz.SalaryItemBiz; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; @@ -25,6 +26,7 @@ import com.engine.salary.service.SalaryEmployeeService; import com.engine.salary.service.TaxAgentService; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.SalaryLoggerUtil; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.valid.ValidUtil; @@ -247,6 +249,20 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi // 构建更新PO SalaryArchiveItemPO updateSalaryArchiveItemPO = buildUpdateSalaryArchiveItemPO(salaryArchiveItemSaveParam, salaryArchiveItems, salaryItemIds, salaryArchiveItem); salaryArchiveItemMapper.updateIgnoreNull(updateSalaryArchiveItemPO); + + // 查询更新后的po + SalaryArchiveItemPO saiNew = salaryArchiveItemMapper.getById(updateSalaryArchiveItemPO.getId()); + // 记录操作日志 + String name = SalaryI18nUtil.getI18nLabel(0, "编辑调薪记录"); + SalaryLoggerUtil.recordUpdateSingleLog(SalaryElogConfig.salaryArchiveItemAdjustLoggerTemplate, + saiNew.getId(), + name + ":" + saiNew.getId(), + name, + name + ":" + saiNew.getId(), + salaryArchiveItem, + saiNew, + user + ); } return StringUtils.EMPTY; } @@ -447,7 +463,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi salaryArchiveItemMapper.deleteBatchIds(effectiveSalaryItemDels); } if (CollectionUtils.isNotEmpty(salaryArchiveItemNews)) { - salaryArchiveItemMapper.batchInsert(salaryArchiveItemNews); + salaryArchiveItemMapper.batchInsert(salaryArchiveItemNews, user); } return StringUtils.EMPTY; @@ -565,6 +581,15 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi salaryArchiveItem.setDeleteType(1); // 删除未生效数据 salaryArchiveItemMapper.updateById(salaryArchiveItem); + // 记录日志 + String operateName = SalaryI18nUtil.getI18nLabel(0, "删除调薪记录"); + SalaryLoggerUtil.recordDeleteSingleLog(SalaryElogConfig.salaryArchiveItemAdjustLoggerTemplate, + salaryArchiveItem.getId(), + operateName + ":" + salaryArchiveItem.getId(), + operateName, + operateName, + salaryArchiveItem, + user); // } else { // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "该薪资项目已生效不可删除")); // } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index e4d2fe9eb..e102293cb 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -5,8 +5,11 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.*; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SalaryItemConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO; @@ -21,6 +24,7 @@ import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentEmpChangePO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.enums.salaryarchive.*; @@ -39,6 +43,7 @@ import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; 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.excel.ExcelParseHelper; import com.engine.salary.util.excel.ExcelSupport; @@ -48,7 +53,6 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.time.DateUtils; @@ -321,7 +325,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe } // 落库处理薪资项目 if (CollectionUtils.isNotEmpty(changeData.getSalaryArchiveItemAddTodos())) { - salaryArchiveItemMapper.batchInsert(changeData.getSalaryArchiveItemAddTodos()); + salaryArchiveItemMapper.batchInsert(changeData.getSalaryArchiveItemAddTodos(), user); } // 删除增量数据 if (CollectionUtils.isNotEmpty(changeData.getChangeIds())) { @@ -586,6 +590,17 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 3.表数据 // return ExcelUtil.genWorkbookV2(rows, sheetName); + + // 记录日志 + String statusStr = StringUtils.join(queryParam.getRunStatusList().stream().map(status -> SalaryArchiveStatusEnum.parseByValue(status).getDefaultLabel()).collect(Collectors.toList()), ","); + String name = SalaryI18nUtil.getI18nLabel(0, "导出"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "薪资档案 ") + statusStr); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "薪资档案") + "-" + name); + loggerContext.setUser(user); + SalaryElogConfig.salaryArchiveLoggerTemplate.write(loggerContext); return ExcelUtilPlus.genWorkbookV2(rows, sheetName); } @@ -685,7 +700,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe }); // 落库处理薪资档案项目数据 if (CollectionUtils.isNotEmpty(salaryArchiveItemAddTodos)) { - salaryArchiveItemMapper.batchInsert(salaryArchiveItemAddTodos); + salaryArchiveItemMapper.batchInsert(salaryArchiveItemAddTodos, user); } if (CollectionUtils.isNotEmpty(salaryArchiveItemDelTodoIds)) { salaryArchiveItemMapper.deleteBatchIds(salaryArchiveItemDelTodoIds); @@ -724,9 +739,49 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // List salaryArchiveSobSaveList = SalaryArchiveBO.buildSalaryArchiveSob(salaryArchive.getId(), salarySobIds, LocalDateTime.now()); // this.salaryArchiveSobService.saveBatchBySalaryArchiveIdsAndSaves(Collections.singletonList(salaryArchive.getId()), salaryArchiveSobSaveList, currentTenantKey); + // 记录日志 + List newList = Collections.singletonList(this.getById(salaryArchive.getId())); + String operatedesc = SalaryI18nUtil.getI18nLabel(0, "发薪设置"); + recordLog(oldList, newList, operatedesc); + return StringUtils.EMPTY; } + /** + * 记录日志 + * + * @param oldSalaryArchiveList + * @param newSalaryArchiveList + * @param operatedesc + */ + private void recordLog(List oldSalaryArchiveList, List newSalaryArchiveList, String operatedesc) { + if (CollectionUtils.isEmpty(oldSalaryArchiveList) || CollectionUtils.isEmpty(oldSalaryArchiveList)) { + return; + } + List updateEmpIds = newSalaryArchiveList.stream().map(SalaryArchivePO::getEmployeeId).distinct().collect(Collectors.toList()); + List employeeList = getSalaryEmployeeService(user).listByIds(updateEmpIds); + Map empMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId, DataCollectionEmployee::getUsername); + + + // 获取所有个税扣缴义务人 + Collection taxAgents = getTaxAgentService(user).listAll(); + Map taxAgentMap = SalaryEntityUtil.convert2Map(taxAgents, TaxAgentPO::getId, TaxAgentPO::getName); + String bar = "-"; + oldSalaryArchiveList.forEach(e -> { + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(e.getId())); + loggerContext.setTargetName(Optional.ofNullable(empMap.get(e.getEmployeeId())).orElse(StringUtils.EMPTY) + bar + Optional.ofNullable(taxAgentMap.get(e.getTaxAgentId())).orElse(StringUtils.EMPTY)); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(operatedesc); + loggerContext.setOperatedesc(operatedesc); + loggerContext.setOldValues(e); + Optional optionalNew = newSalaryArchiveList.stream().filter(n -> n.getId().equals(e.getId())).findFirst(); + loggerContext.setNewValues(optionalNew.orElse(null)); + SalaryElogConfig.salaryArchiveLoggerTemplate.write(loggerContext); + }); + } + @Override public List dimissionSets() { @@ -955,7 +1010,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe this.salaryArchiveMapper.batchInsert(salaryArchiveAddList); } if (CollectionUtils.isNotEmpty(salaryArchiveItemAddList)) { - this.salaryArchiveItemMapper.batchInsert(salaryArchiveItemAddList); + this.salaryArchiveItemMapper.batchInsert(salaryArchiveItemAddList, user); } log.info("处理历史数据结束==============="); } @@ -1076,6 +1131,10 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe } // 从待定薪到停薪 getSalaryArchiveMapper().deletePendingTodo(ids); + // 记录日志 + List newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build()); + String operatedesc = SalaryI18nUtil.getI18nLabel(0, "删除待办"); + recordLog(oldList, newList, operatedesc); return StringUtils.EMPTY; } @@ -1106,6 +1165,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe List> partition = Lists.partition((List) ids, 1000); partition.forEach(getSalaryArchiveMapper()::gotoFixed); + // 记录日志 + List newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build()); + String operateDesc = SalaryI18nUtil.getI18nLabel(0, "设为发薪员工"); + recordLog(salaryArchiveList, newList, operateDesc); + // 获取所有可被引用的薪资项目 List salaryItemIds = getSalaryArchiveItemService(user).getCanAdjustSalaryItems().stream().map(SalaryItemPO::getId).collect(Collectors.toList()); List currentEffectiveItemList = getSalaryArchiveItemService(user).getCurrentEffectiveItemListIngoreValue(ids, salaryItemIds) @@ -1170,6 +1234,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 从待停薪到停薪 getSalaryArchiveMapper().gotoStop(ids); + // 记录日志 + List newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build()); + String operatedesc = SalaryI18nUtil.getI18nLabel(0, "停薪"); + recordLog(oldList, newList, operatedesc); + Map resultMap = new HashMap<>(2); String resultMsg = SalaryI18nUtil.getI18nLabel(94620, "操作成功"); String resultType = "success"; @@ -1241,7 +1310,13 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe } // 删除最后发薪日期，设置状态为发薪 if (CollectionUtils.isNotEmpty(list)) { - getSalaryArchiveMapper().deleteSuspendTodo(list.stream().map(SalaryArchiveListDTO::getId).collect(Collectors.toList())); + List salaryArchiveIds = list.stream().map(SalaryArchiveListDTO::getId).collect(Collectors.toList()); + getSalaryArchiveMapper().deleteSuspendTodo(salaryArchiveIds); + // 记录日志 + List oldList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(salaryArchiveIds).build()); + List newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build()); + String operatedesc = SalaryI18nUtil.getI18nLabel(0, "删除待办"); + recordLog(oldList, newList, operatedesc); } return StringUtils.EMPTY; } @@ -1275,6 +1350,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 从停薪到定薪 getSalaryArchiveMapper().gotoFixedFromStop(ids); + // 记录日志 + List newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build()); + String operatedesc = SalaryI18nUtil.getI18nLabel(0, "取消停薪"); + recordLog(oldList, newList, operatedesc); + return StringUtils.EMPTY; } diff --git a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java index 0cda15391..4789efd76 100644 --- a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java @@ -8,7 +8,9 @@ import com.engine.core.impl.Service; import com.engine.salary.biz.SalarySendBiz; import com.engine.salary.biz.SalarySendInfoBiz; import com.engine.salary.cache.SalaryCacheKey; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.HrmSalaryPayrollConf; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.progress.ProgressDTO; import com.engine.salary.entity.salaryBill.bo.SalaryBillBO; @@ -24,6 +26,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salarybill.*; import com.engine.salary.enums.salarysend.SalarySendGrantTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; @@ -758,6 +761,19 @@ public class SalaryBillServiceImpl extends Service implements SalaryBillService salarySendNew.setLastSendTime(new Date()); mapper.updateById(salarySendNew); + + // 记录日志 + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setTargetId(String.valueOf(salarySend.getId())); + loggerContext.setTargetName(SalaryDateUtil.getFormatYearMonth(salarySend.getSalaryMonth()) + "-" + (salarySob == null ? "" : salarySob.getName())); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0,"工资单发放")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0,"工资单发放")); + loggerContext.setOldValues(salarySend); + loggerContext.setNewValues(salarySendNew); + loggerContext.setOperator(user.getUID() + StringUtils.EMPTY); + loggerContext.setOperatorName(Objects.isNull(user) ? StringUtils.EMPTY : user.getUsername()); + SalaryElogConfig.salarySendLoggerTemplate.write(loggerContext); } // /** diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index e18e8569a..ca9160cdd 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -191,7 +191,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService // } @Override - public void save(SalaryItemSaveParam saveParam) { + public SalaryItemPO save(SalaryItemSaveParam saveParam) { // 名称不能和已有的自定义薪资项目重名 List salaryItemPOS = listByName(saveParam.getName()); if (CollectionUtils.isNotEmpty(salaryItemPOS)) { @@ -204,16 +204,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService } SalaryItemPO salaryItemPO = SalaryItemBO.convert2SalaryItemPO(saveParam, (long) user.getUID()); salaryItemBiz.insert(salaryItemPO); - // 记录日志 - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); - loggerContext.setTargetName(salaryItemPO.getName()); - loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目") + ": " + salaryItemPO.getName()); - loggerContext.setNewValues(salaryItemPO); - SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); + return salaryItemPO; } @Override @@ -222,7 +213,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService } @Override - public void update(SalaryItemSaveParam saveParam) { + public SalaryItemPO update(SalaryItemSaveParam saveParam) { // 查询薪资项目，判断薪资项目是否存在 SalaryItemPO salaryItemPO = getById(saveParam.getId()); if (Objects.isNull(salaryItemPO)) { @@ -286,18 +277,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService } } - - // 记录日志 - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); - loggerContext.setTargetName(newSalaryItemPO.getName()); - loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资项目") + ": " + newSalaryItemPO.getName()); - loggerContext.setOldValues(salaryItemPO); - loggerContext.setNewValues(newSalaryItemPO); - SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); + return salaryItemPO; } private void changeName(SalaryItemPO salaryItemPO, String oldName, String newName, String itemPrefix, String fieldNamePrefix) { @@ -351,18 +331,36 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService // 删除薪资项目 ids = SalaryEntityUtil.properties(salaryItemPOS, SalaryItemPO::getId); salaryItemBiz.deleteByIds(ids); + Integer useInEmployeeSalary = salaryItemPOS.get(0).getUseInEmployeeSalary(); // 记录删除日志 - salaryItemPOS.forEach(salaryItemPO -> { - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); - loggerContext.setTargetName(salaryItemPO.getName()); - loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目") + ": " + salaryItemPO.getName()); - loggerContext.setOldValues(salaryItemPO); - SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); - }); + if (useInEmployeeSalary == 0) { + // 薪资项目 + salaryItemPOS.forEach(salaryItemPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); + loggerContext.setTargetName(salaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目") + ": " + salaryItemPO.getName()); + loggerContext.setOldValues(salaryItemPO); + SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); + }); + } else { + // 字段管理 + salaryItemPOS.forEach(salaryItemPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); + loggerContext.setTargetName(salaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除字段")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除字段") + ": " + salaryItemPO.getName()); + loggerContext.setOldValues(salaryItemPO); + SalaryElogConfig.salaryArchiveFieldLoggerTemplate.write(loggerContext); + }); + } + } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 19603ddd4..1189589c8 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -11,10 +11,13 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SalarySendBiz; import com.engine.salary.biz.SalarySendInfoBiz; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryArchiveConstant; import com.engine.salary.constant.SalaryItemConstant; import com.engine.salary.constant.SalaryTemplateSalaryItemSetGroupConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; +import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryBill.bo.SalaryBillBO; import com.engine.salary.entity.salaryBill.dto.*; @@ -35,6 +38,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobBackItemPO; import com.engine.salary.entity.salarysob.po.SalarySobItemPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveFieldTypeEnum; import com.engine.salary.enums.salarybill.BillConfimStatusEnum; @@ -57,11 +61,11 @@ import com.engine.salary.util.JsonUtil; 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.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; -import com.engine.salary.util.db.IdGenerator; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -660,6 +664,17 @@ public class SalarySendServiceImpl extends Service implements SalarySendService map.put("showFeedback", "0"); } + + // 记录查看日志 + String targetName = taxAgentPO.getName() + "-" + SalaryDateUtil.getFormatYearMonth(salarySendInfo.getSalaryMonth()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salarySendInfo.getId())); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.READ.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看工资单") + ": " + targetName + " " + salaryInfoId); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看工资单") + ": " + targetName); + SalaryElogConfig.mySalaryBillLoggerTemplate.write(loggerContext); return map; } @@ -1409,14 +1424,20 @@ public class SalarySendServiceImpl extends Service implements SalarySendService salarySendNew.setSendTotal(sendTotal); mapper.updateById(salarySendNew); + SalarySobPO salarySob = getSalarySobService(user).getById(salarySend.getSalarySobId()); // 记录日志 -// SalaryLoggerUtil.recordUpdateSingleLog(salarySendLoggerTemplate, -// salarySend.getId(), -// salarySend.getSalaryMonth() + "-" + (CollectionUtils.isNotEmpty(salarySobs) ? salarySobs.get(0).getName() : ""), -// SalaryI18nUtil.getI18nLabel(currentTenantKey, currentEmployeeId, 100521, "撤回工资单发放"), -// SalaryI18nUtil.getI18nLabel(currentTenantKey, currentEmployeeId, 100521, "撤回工资单发放"), -// salarySend, -// salarySendNew); + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setTargetId(String.valueOf(salarySend.getId())); + loggerContext.setTargetName(SalaryDateUtil.getFormatYearMonth(salarySend.getSalaryMonth()) + "-" + (salarySob == null ? "" : salarySob.getName())); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "撤回工资单")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "撤回工资单")); + loggerContext.setOldValues(salarySend); + loggerContext.setNewValues(salarySendNew); + loggerContext.setOperator(user.getUID() + StringUtils.EMPTY); + loggerContext.setOperatorName(Objects.isNull(user) ? StringUtils.EMPTY : user.getUsername()); + SalaryElogConfig.salarySendLoggerTemplate.write(loggerContext); + SalarySendGrantParam grantParam = SalarySendGrantParam.builder().ids(param.getIds()).salarySendId(param.getSalarySendId()).build(); @@ -1487,6 +1508,19 @@ public class SalarySendServiceImpl extends Service implements SalarySendService row.add(dto.getSendStatus()); rows.add(row); } + + // 记录操作日志 + SalarySendPO salarySend = mapper.getById(queryParam.getSalarySendId()); + SalarySobPO salarySob = getSalarySobService(user).getById(salarySend.getSalarySobId()); + + String name = SalaryDateUtil.getFormatYearMonth(salarySend.getSalaryMonth()) + "-" + (salarySob == null ? "" : salarySob.getName()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(name); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "工资单发放") + ":" + name + SalaryI18nUtil.getI18nLabel(0, " 导出")); + loggerContext.setUser(user); + SalaryElogConfig.salarySendLoggerTemplate.write(loggerContext); return ExcelUtil.genWorkbookV2(rows, sheetName); } @@ -1551,6 +1585,19 @@ public class SalarySendServiceImpl extends Service implements SalarySendService rows.add(row); } + + // 记录日志 + SalarySobPO salarySob = getSalarySobService(user).getById(salaryAcctRecord.getSalarySobId()); + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setTargetId(String.valueOf(salarySend.getId())); + loggerContext.setTargetName(SalaryDateUtil.getFormatYearMonth(salarySend.getSalaryMonth()) + "-" + (salarySob == null ? "" : salarySob.getName())); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0,"导出工资单")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0,"导出工资单")); + loggerContext.setOperator(user.getUID() + StringUtils.EMPTY); + loggerContext.setOperatorName(Objects.isNull(user) ? StringUtils.EMPTY : user.getUsername()); + SalaryElogConfig.salarySendLoggerTemplate.write(loggerContext); + return ExcelUtil.genWorkbookV2(rows, sheetName); } diff --git a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java index c068f377d..160151c16 100644 --- a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java @@ -79,11 +79,12 @@ public class SalarySobAdjustRuleServiceImpl extends Service implements SalarySob } // 记录日志 LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(salarySobPO.getId())); loggerContext.setTargetName(salarySobPO.getName()); loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98614, "保存调薪计薪规则")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98614, "保存调薪计薪规则")); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "保存调薪计薪规则")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "保存调薪计薪规则")); SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java index 722149a40..07dbcfe61 100644 --- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java @@ -3,7 +3,9 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.*; +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.salaryBill.po.SalaryTemplatePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO; @@ -18,6 +20,7 @@ import com.engine.salary.entity.taxagent.param.TaxAgentRangeQueryParam; import com.engine.salary.entity.taxagent.po.TaxAgentAdminPO; import com.engine.salary.entity.taxagent.po.TaxAgentExtRangePO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.SalarySystemTypeEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum; @@ -30,13 +33,13 @@ import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; 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.RuntimeTypeEnum; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; -import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ObjectUtils; @@ -281,15 +284,16 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { SalarySobPO salarySobPO = SalarySobBO.convert2PO(saveParam, (long) user.getUID()); // 保存薪资账套 salarySobMapper.insert(salarySobPO); - //todo 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(salarySobPO.getId())); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98404, "新建薪资账套")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98404, "新建薪资账套") + ": " + salarySobPO.getName()); -// loggerContext.setOldValues(salarySobPO); -// salarySobLoggerTemplate.write(loggerContext); + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salarySobPO.getId())); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建薪资账套")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建薪资账套") + ": " + salarySobPO.getName()); + loggerContext.setNewValues(salarySobPO); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); // 新建薪资账套时，保存默认的员工信息字段 saveDefaultEmpField(salarySobPO); // 新建薪资账套时，保存默认的薪资项目 @@ -531,15 +535,16 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { .setUpdateTime(new Date()); salarySobMapper.updateById(newSalarySobPO); // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId(String.valueOf(newSalarySobPO.getId())); -// loggerContext.setTargetName(newSalarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98526, "编辑薪资账套基础设置")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98526, "编辑薪资账套基础设置")); -// loggerContext.setOldValues(salarySobPO); -// loggerContext.setNewValues(newSalarySobPO); -// salarySobLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(newSalarySobPO.getId())); + loggerContext.setTargetName(newSalarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套基础设置")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套基础设置")); + loggerContext.setOldValues(salarySobPO); + loggerContext.setNewValues(newSalarySobPO); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); // 返回薪资账套的主键id return salarySobPO.getId(); } @@ -548,6 +553,8 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { public void updateDisable(SalarySobDisableParam disableParam) { // 查询薪资账套 SalarySobPO salarySobPO = getById(disableParam.getId()); + SalarySobPO oldSalarySobPO = new SalarySobPO(); + BeanUtils.copyProperties(salarySobPO, oldSalarySobPO); if (Objects.isNull(salarySobPO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98379, "参数错误，薪资账套不存在或者已被删除")); } @@ -555,16 +562,19 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { salarySobPO.setDisable(disableParam.getDisable()); salarySobPO.setUpdateTime(new Date()); salarySobMapper.updateById(salarySobPO); - // todo 记录日志 -// String operateTypeName = Objects.equals(disableParam.getDisable(), NumberUtils.INTEGER_ONE) ? -// SalaryI18nUtil.getI18nLabel(98591, "禁用薪资账套") : SalaryI18nUtil.getI18nLabel(98592, "启用薪资账套"); -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(operateTypeName); -// loggerContext.setOperatedesc(operateTypeName + ": " + salarySobPO.getName()); -// salarySobLoggerTemplate.write(loggerContext); + // 记录日志 + String operateTypeName = Objects.equals(disableParam.getDisable(), NumberUtils.INTEGER_ONE) ? + SalaryI18nUtil.getI18nLabel(0, "禁用薪资账套") : SalaryI18nUtil.getI18nLabel(0, "启用薪资账套"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salarySobPO.getId()); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(operateTypeName); + loggerContext.setOperatedesc(operateTypeName + ": " + salarySobPO.getName()); + loggerContext.setOldValues(oldSalarySobPO); + loggerContext.setNewValues(salarySobPO); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } @Override @@ -619,16 +629,18 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { getSalarySobBackItemService(user).deleteBySalarySobIds(ids); // 删除薪资账套的校验规则 getSalarySobCheckRuleService(user).deleteBySalarySobIds(ids); -// // 记录日志 -// salarySobPOS.forEach(salarySobPO -> { -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + salarySobPO.getId()); -// loggerContext.setTargetName(salarySobPO.getName()); -// loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98535, "删除薪资账套")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98535, "删除薪资账套")); -// salarySobLoggerTemplate.write(loggerContext); -// }); + // 记录日志 + salarySobPOS.forEach(salarySobPO -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + salarySobPO.getId()); + loggerContext.setTargetName(salarySobPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资账套")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资账套")); + loggerContext.setOldValues(salarySobPO); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); + }); } @Override @@ -771,14 +783,15 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { if (CollectionUtils.isNotEmpty(result.getSalarySobCheckRules())) { getSalarySobCheckRuleService(user).batchSave(result.getSalarySobCheckRules()); } -// // 记录日志 -// LoggerContext loggerContext = new LoggerContext<>(); -// loggerContext.setTargetId("" + result.getSalarySob().getId()); -// loggerContext.setTargetName(result.getSalarySob().getName()); -// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); -// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98570, "复制薪资账套")); -// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98570, "复制薪资账套") + ": " + salarySobPO.getName()); -// salarySobLoggerTemplate.write(loggerContext); + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + result.getSalarySob().getId()); + loggerContext.setTargetName(result.getSalarySob().getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98570, "复制薪资账套")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98570, "复制薪资账套") + ": " + salarySobPO.getName()); + SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java index dd9d49cd9..c32877e01 100644 --- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java @@ -8,6 +8,8 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SalarySobBiz; import com.engine.salary.biz.SalaryTemplateBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salaryBill.bo.SalaryTemplateBO; import com.engine.salary.entity.salaryBill.dto.SalaryTemplateListDTO; import com.engine.salary.entity.salaryBill.dto.SalaryTemplateSalaryItemListDTO; @@ -18,22 +20,26 @@ import com.engine.salary.entity.salaryBill.param.SalaryTemplateQueryParam; import com.engine.salary.entity.salaryBill.param.SalaryTemplateSaveParam; import com.engine.salary.entity.salaryBill.po.SalaryBillItemNamePO; import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO; -import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.dto.SalarySobItemAggregateDTO; import com.engine.salary.entity.salarysob.dto.SalarySobItemDTO; import com.engine.salary.entity.salarysob.dto.SalarySobItemGroupDTO; -import com.engine.salary.entity.salarysob.po.*; +import com.engine.salary.entity.salarysob.po.SalarySobEmpFieldPO; +import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; +import com.engine.salary.entity.salarysob.po.SalarySobItemPO; +import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salarybill.SalaryTemplateWhetherEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.salarysob.SalarySobEmpFieldMapper; +import com.engine.salary.report.entity.po.SalaryStatisticsReportPO; import com.engine.salary.service.*; 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.mzlion.core.utils.BeanUtils; -import com.engine.salary.util.db.IdGenerator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -116,14 +122,14 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate mapper.updateById(salaryTemplateNew); // 记录日志 -// SalaryLoggerUtil.recordUpdateSingleLog(salaryTemplateLoggerTemplate, -// salaryTemplate.getId(), -// salaryTemplateNew.getName(), -// SalaryI18nUtil.getI18nLabel(currentTenantKey, currentEmployeeId, 100534, "设为默认使用"), -// SalaryI18nUtil.getI18nLabel(currentTenantKey, currentEmployeeId, 100534, "设为默认使用"), -// salaryTemplate, -// salaryTemplateNew); - + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryTemplateNew.getId())); + loggerContext.setTargetName(salaryTemplateNew.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "设为默认使用")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "设为默认使用")); + SalaryElogConfig.salaryTemplateLoggerTemplate.write(loggerContext); return ""; } @@ -167,12 +173,15 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate saveParam.getSalaryBillItemNameSetting().stream().forEach(set -> set.setSalaryTemplateId(salaryTemplate.getId())); getSalaryBillItemNameService(user).saveItemShowName(saveParam.getSalaryBillItemNameSetting()); // 记录日志 -// SalaryLoggerUtil.recordAddSingleLog(salaryTemplateLoggerTemplate, -// salaryTemplate.getId(), -// salaryTemplate.getName(), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100538, "新增工资单模板"), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100538, "新增工资单模板"), -// salaryTemplate); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryTemplate.getId())); + loggerContext.setTargetName(salaryTemplate.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "新增工资单模板")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "新增工资单模板")); + loggerContext.setNewValues(salaryTemplate); + SalaryElogConfig.salaryTemplateLoggerTemplate.write(loggerContext); return ""; } @@ -255,13 +264,16 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate getSalaryBillItemNameService(user).deleteByIds(needDeleteIds); // 记录日志 -// SalaryLoggerUtil.recordUpdateSingleLog(salaryTemplateLoggerTemplate, -// salaryTemplate.getId(), -// salaryTemplateNew.getName(), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100539, "编辑工资单模板"), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100539, "编辑工资单模板"), -// salaryTemplate, -// salaryTemplateNew); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryTemplateNew.getId())); + loggerContext.setTargetName(salaryTemplateNew.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "编辑工资单模板")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "编辑工资单模板")); + loggerContext.setOldValues(salaryTemplate); + loggerContext.setNewValues(salaryTemplateNew); + SalaryElogConfig.salaryTemplateLoggerTemplate.write(loggerContext); return ""; } @@ -369,12 +381,15 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate getSalaryBillItemNameService(user).batchInsert(needInsertList); } // 记录日志 -// SalaryLoggerUtil.recordAddSingleLog(salaryTemplateLoggerTemplate, -// salaryTemplateNew.getId(), -// salaryTemplateNew.getName(), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100541, "复制工资单模板"), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100541, "复制工资单模板"), -// salaryTemplateNew); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryTemplateNew.getId())); + loggerContext.setTargetName(salaryTemplateNew.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "复制工资单模板")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "复制工资单模板")); + loggerContext.setNewValues(salaryTemplateNew); + SalaryElogConfig.salaryTemplateLoggerTemplate.write(loggerContext); return ""; } @@ -393,12 +408,16 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate // 删除工资单重命名表 getSalaryBillItemNameService(user).deleteByTemplateIds(ids); // 记录日志 -// salaryTemplates.forEach(e -> SalaryLoggerUtil.recordDeleteSingleLog(salaryTemplateLoggerTemplate, -// e.getId(), -// e.getName(), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100542, "删除工资单模板"), -// SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100542, "删除工资单模板")+"：" + e.getName(), -// e)); + salaryTemplates.stream().forEach(template -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(template.getId())); + loggerContext.setTargetName(template.getName() + ":" + template.getId()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "删除工资单模板")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "删除工资单模板")); + SalaryElogConfig.salaryTemplateLoggerTemplate.write(loggerContext); + }); return ""; } diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index 3ac80b609..4585b6fb0 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -4,7 +4,10 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.biz.SpecialAddDeductionBiz; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; +import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionListDTO; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO; @@ -16,6 +19,7 @@ import com.engine.salary.entity.datacollection.po.SpecialAddDeductionPO; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeTaxAgentDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.datacollection.SpecialAddDeductionMapper; @@ -330,7 +334,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd } //入库 - SpecialAddDeductionBiz.handleImportData(eligibleData); + SpecialAddDeductionBiz.handleImportData(eligibleData, user); apidatas.put("successCount", successCount); apidatas.put("errorCount", errorCount); @@ -365,6 +369,16 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd //获取操作按钮资源 List> rowList = getExcelRowList(param, isTemplate); + // 记录操作日志 + String name = SalaryI18nUtil.getI18nLabel(0, "导出"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除")); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除") + "-" + name); + loggerContext.setUser(user); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + //获取excel return ExcelUtil.genWorkbook(rowList, "专项附加免税扣除"); } @@ -509,6 +523,21 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd .build(); updateList.add(build); SpecialAddDeductionBiz.batchUpdate(updateList); + + // 记录操作日志 + SpecialAddDeductionPO newValue = SpecialAddDeductionBiz.getById(build.getId()); + String name = SalaryI18nUtil.getI18nLabel(0, "编辑"); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(newValue.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除") + "-" + newValue.getId()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(name); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "编辑")); + loggerContext.setOldValues(byId); + loggerContext.setNewValues(newValue); + loggerContext.setUser(user); + SalaryElogConfig.specialAddDeductionLoggerTemplate.write(loggerContext); } @Override @@ -568,7 +597,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd //fixme 分权判断 insertData.add(po); //入库 - SpecialAddDeductionBiz.handleImportData(insertData); + SpecialAddDeductionBiz.handleImportData(insertData, user); } @Override @@ -580,6 +609,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd SpecialAddDeductionBiz SpecialAddDeductionBiz = new SpecialAddDeductionBiz(); List deleteIds = deleteParam.getIds(); List deleteList = new ArrayList<>(); + List oldSpecialAddDeductionList = new ArrayList<>(); for (Long id : deleteIds) { SpecialAddDeductionPO byId = SpecialAddDeductionBiz.getById(id); if (byId == null) { @@ -595,6 +625,22 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd deleteList.add(byId.getId()); } SpecialAddDeductionBiz.batchDeleteByIds(deleteList); + + // 记录操作日志 + if (CollectionUtils.isNotEmpty(oldSpecialAddDeductionList)) { + oldSpecialAddDeductionList.stream().forEach( e -> { + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetId(e.getId().toString()); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除") + "-" + e.getId()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "删除")); + loggerContext.setOldValues(e); + loggerContext.setUser(user); + SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); + }); + } } @Override @@ -622,6 +668,20 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd List list = specialAddDeductionBiz.listByTaxAgentIds(taxAgentIds); List deleteIds = list.stream().map(SpecialAddDeductionPO::getId).collect(Collectors.toList()); specialAddDeductionBiz.batchDeleteByIds(deleteIds); + + // 记录操作日志 + Collection finalTaxAgentIds =taxAgentIds; + List taxAgentNames = taxAgentList.stream().filter(t -> finalTaxAgentIds.contains(t.getTaxAgentId())) + .map(TaxAgentManageRangeEmployeeDTO::getTaxAgentName).collect(Collectors.toList()); + String name = StringUtils.join(taxAgentNames, ","); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setTargetName(name); + loggerContext.setOperateType(OperateTypeEnum.CLEAR.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "一键清空")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除") + "-" + SalaryI18nUtil + .getI18nLabel(0, "一键清空：") + name); + loggerContext.setUser(user); + SalaryElogConfig.specialAddDeductionLoggerTemplate.write(loggerContext); } @Override diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index caf96a0f9..b62c49006 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -4,6 +4,7 @@ import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.dev.api.util.Util_DataCache; 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.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.hrm.DeptInfo; @@ -30,6 +31,8 @@ import com.engine.salary.service.*; import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.SalaryLoggerUtil; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; import com.engine.salary.util.page.PageInfo; @@ -38,13 +41,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.weaver.util.threadPool.ThreadPoolUtil; import com.weaver.util.threadPool.entity.LocalRunnable; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.math.NumberUtils; import org.apache.poi.util.IOUtils; +import org.springframework.beans.BeanUtils; import weaver.file.ImageFileManager; import weaver.general.Util; import weaver.hrm.User; @@ -316,6 +319,12 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM List taxAgentManageAllRanges = listByTaxAgentId(saveParam.getTaxAgentId()); List taxAgentManageRanges = taxAgentManageAllRanges.stream().filter(f -> f.getIncludeType().equals(saveParam.getIncludeType())).collect(Collectors.toList()); + List oldManageList = new ArrayList<>(); + taxAgentManageRanges.stream().forEach(p -> { + TaxAgentManageRangePO target = new TaxAgentManageRangePO(); + BeanUtils.copyProperties(p, target); + oldManageList.add(target); + }); // 处理一下本次的保存参数（如果原来添加过对应的人员（/部门/岗位），那么本次不需要新增，只需要更新） TaxAgentBO.Result result = TaxAgentBO.handleTaxAgentRange(taxAgentManageRanges, saveParam, taxAgent.getId(), (long) user.getUID(), false); @@ -331,10 +340,37 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM /* 检查当前个税扣缴义务人的所有人员范围与所有分管理员的管理范围===========================end */ if (CollectionUtils.isNotEmpty(result.getNeedInsertTaxAgentManageRanges())) { - result.getNeedInsertTaxAgentManageRanges().forEach(range -> getTaxAgentManageRangeMapper().insertIgnoreNull(range)); + result.getNeedInsertTaxAgentManageRanges().forEach(range -> { + getTaxAgentManageRangeMapper().insertIgnoreNull(range); + // 记录操作日志 + String name = taxAgent.getName() + "_" + TargetTypeEnum.parseByValue(range.getTargetType()).getDefaultLabel() + "_" + range.getTaxAgentId(); + SalaryLoggerUtil.recordAddSingleLog(SalaryElogConfig.taxAgentLoggerTemplate, + range.getId(), + name, + SalaryI18nUtil.getI18nLabel(0, "新增人员范围"), + SalaryI18nUtil.getI18nLabel(0, "新增人员范围") + name, + range, + user); + }); + } if (CollectionUtils.isNotEmpty(result.getNeedUpdateTaxAgentManageRanges())) { - result.getNeedUpdateTaxAgentManageRanges().forEach(range -> getTaxAgentManageRangeMapper().updateIgnoreNull(range)); + Map oldMap = SalaryEntityUtil.convert2Map(oldManageList, TaxAgentManageRangePO::getId); + result.getNeedUpdateTaxAgentManageRanges().forEach(range -> { + getTaxAgentManageRangeMapper().updateIgnoreNull(range); + // 记录操作日志 + TaxAgentManageRangePO oldPO = oldMap.getOrDefault(range.getId(), TaxAgentManageRangePO.builder().build()); + String name = taxAgent.getName() + "_" + TargetTypeEnum.parseByValue(range.getTargetType()).getDefaultLabel() + "_" + range.getTaxAgentId(); + SalaryLoggerUtil.recordUpdateSingleLog(SalaryElogConfig.taxAgentLoggerTemplate, + range.getId(), + name, + SalaryI18nUtil.getI18nLabel(0, "更新人员范围"), + SalaryI18nUtil.getI18nLabel(0, "更新人员范围") + name, + oldPO, + range, + user); + }); + } /* 同步本地人员范围的关联人员=========================== */ @@ -527,19 +563,21 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM @Override public void deleteByIds(Collection ids) { // 查询管理范围 - List taxAgentManageRanges = listByIds(ids); - if (CollectionUtils.isEmpty(taxAgentManageRanges)) { + List taxAgentManageRangeList = listByIds(ids); + + if (CollectionUtils.isEmpty(taxAgentManageRangeList)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98604, "数据不存在或已被删除")); } - List taxAgentIds = taxAgentManageRanges.stream().map(TaxAgentManageRangePO::getTaxAgentId).distinct().collect(Collectors.toList()); + List taxAgentIds = taxAgentManageRangeList.stream().map(TaxAgentManageRangePO::getTaxAgentId).distinct().collect(Collectors.toList()); if (taxAgentIds.size() > 1) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(110159, "一次只能删一个个税个税扣缴义务人的范围")); } - taxAgentManageRanges = this.listByTaxAgentIds(taxAgentIds); + List taxAgentManageRanges = this.listByTaxAgentIds(taxAgentIds); List allManageRanges = taxAgentManageRanges.stream().filter(f -> !ids.contains(f.getId())).collect(Collectors.toList()); List allRanges = allManageRanges.stream().filter(f -> f.getRangeType().equals(TaxAgentRangeTypeEnum.TAXAGENT.getValue())).collect(Collectors.toList()); // List allSubAdminRanges = allManageRanges.stream().filter(f -> f.getRangeType().equals(TaxAgentRangeTypeEnum.SUBADMIN.getValue())).collect(Collectors.toList()); Long taxAgentId = taxAgentIds.get(0); + TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(taxAgentId); List salaryEmployees = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ORG); List allSalaryEmployees = this.getManageRangeSalaryEmployees(taxAgentId, allRanges, salaryEmployees); @@ -554,9 +592,21 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM // 删除管理范围 getTaxAgentManageRangeMapper().deleteByIds(ids); + // 记录操作日志 + taxAgentManageRangeList.stream().forEach(range -> { + String name = taxAgentPO.getName() + "_" + TargetTypeEnum.parseByValue(range.getTargetType()).getDefaultLabel() + "_" + range.getTaxAgentId(); + SalaryLoggerUtil.recordDeleteSingleLog(SalaryElogConfig.taxAgentLoggerTemplate, + range.getId(), + name, + SalaryI18nUtil.getI18nLabel(0, "删除人员范围"), + SalaryI18nUtil.getI18nLabel(0, "删除人员范围") + name, + range, + user); + }); + + /** 同步本地人员范围的关联人员=========================== */ syncLocalEmp(taxAgentId, allSalaryEmployees, false); - // 记录日志 todo } @Override @@ -858,6 +908,13 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM // 查询已有的管理范围 List taxAgentManageAllRanges = listByTaxAgentId(taxAgentId); List taxAgentManageRanges = taxAgentManageAllRanges.stream().filter(f -> f.getIncludeType().equals(taxAgentRangeSaveParam.getIncludeType())).collect(Collectors.toList()); + List oldManageList = new ArrayList<>(); + taxAgentManageRanges.stream().forEach(p -> { + TaxAgentManageRangePO target = new TaxAgentManageRangePO(); + BeanUtils.copyProperties(p, target); + oldManageList.add(target); + }); + // 处理一下本次的保存参数（如果原来添加过对应的人员（/部门/岗位），那么本次不需要新增，只需要更新） TaxAgentBO.Result result = TaxAgentBO.handleTaxAgentRange(taxAgentManageRanges, taxAgentRangeSaveParam, taxAgent.getId(), (long) user.getUID(), true); @@ -873,10 +930,36 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM /* 检查当前个税扣缴义务人的所有人员范围与所有分管理员的管理范围===========================end */ if (CollectionUtils.isNotEmpty(result.getNeedInsertTaxAgentManageRanges())) { - result.getNeedInsertTaxAgentManageRanges().forEach(range -> getTaxAgentManageRangeMapper().insertIgnoreNull(range)); + result.getNeedInsertTaxAgentManageRanges().forEach(range -> { + getTaxAgentManageRangeMapper().insertIgnoreNull(range); + // 记录操作日志 + String name = taxAgent.getName() + "_" + TargetTypeEnum.parseByValue(range.getTargetType()).getDefaultLabel() + "_" + range.getTargetId(); + SalaryLoggerUtil.recordAddSingleLog(SalaryElogConfig.taxAgentLoggerTemplate, + range.getId(), + name, + SalaryI18nUtil.getI18nLabel(0, "新增人员范围"), + SalaryI18nUtil.getI18nLabel(0, "新增人员范围") + name, + range, + user); + }); } if (CollectionUtils.isNotEmpty(result.getNeedUpdateTaxAgentManageRanges())) { - result.getNeedUpdateTaxAgentManageRanges().forEach(range -> getTaxAgentManageRangeMapper().updateIgnoreNull(range)); + Map oldMap = SalaryEntityUtil.convert2Map(oldManageList, TaxAgentManageRangePO::getId); + result.getNeedUpdateTaxAgentManageRanges().forEach(range -> { + getTaxAgentManageRangeMapper().updateIgnoreNull(range); + // 记录操作日志 + TaxAgentManageRangePO oldPO = oldMap.getOrDefault(range.getId(), TaxAgentManageRangePO.builder().build()); + String name = taxAgent.getName() + "_" + TargetTypeEnum.parseByValue(range.getTargetType()).getDefaultLabel() + "_" + range.getTargetId(); + SalaryLoggerUtil.recordUpdateSingleLog(SalaryElogConfig.taxAgentLoggerTemplate, + range.getId(), + name, + SalaryI18nUtil.getI18nLabel(0, "更新人员范围"), + SalaryI18nUtil.getI18nLabel(0, "更新人员范围") + name, + oldPO, + range, + user); + }); + } /* 同步本地人员范围的关联人员=========================== */ diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index 63636d810..1ec8469ab 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -4,7 +4,9 @@ import com.engine.common.service.HrmCommonService; import com.engine.common.service.impl.HrmCommonServiceImpl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryAuthConstant; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.AddUpDeduction; import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; @@ -24,6 +26,7 @@ import com.engine.salary.entity.taxagent.param.TaxAgentAdminChangeCheckParam; import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam; import com.engine.salary.entity.taxagent.param.TaxAgentSaveParam; import com.engine.salary.entity.taxagent.po.*; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum; @@ -347,13 +350,15 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { getTaxAgentAdminService(user).batchInsert(taxAgent.getId(), saveParam.getAdminUserIds()); } // 记录日志 -// SalaryLoggerUtil.recordAddSingleLog(taxAgentLoggerTemplate, -// taxAgent.getId(), -// taxAgent.getName(), -// SalaryI18nUtil.getI18nLabel( 93766, "新增个税扣缴义务人"), -// SalaryI18nUtil.getI18nLabel( 93766, "新增个税扣缴义务人"), -// taxAgent); - + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(taxAgent.getId().toString()); + loggerContext.setTargetName(taxAgent.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增个税扣缴义务人")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增个税扣缴义务人")); + loggerContext.setNewValues(taxAgent); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); return StringUtils.EMPTY + taxAgent.getId(); } @@ -402,13 +407,16 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { getTaxAgentAdminService(user).batchInsert(saveParam.getId(), saveParam.getAdminUserIds()); } // 记录日志 -// SalaryLoggerUtil.recordUpdateSingleLog(taxAgentLoggerTemplate, -// taxAgent.getId(), -// taxAgentNew.getName(), -// SalaryI18nUtil.getI18nLabel(93767, "编辑个税扣缴义务人"), -// SalaryI18nUtil.getI18nLabel(93767, "编辑个税扣缴义务人"), -// taxAgent, -// taxAgentNew); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(taxAgentNew.getId().toString()); + loggerContext.setTargetName(taxAgentNew.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑个税扣缴义务人")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑个税扣缴义务人")); + loggerContext.setOldValues(taxAgent); + loggerContext.setNewValues(taxAgentNew); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); return StringUtils.EMPTY; } @@ -460,13 +468,18 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { getTaxAgentMapper().deleteByIds(ids); // 记录日志 -// taxAgents.forEach(e -> SalaryLoggerUtil.recordDeleteSingleLog(taxAgentLoggerTemplate, -// e.getId(), -// e.getName(), -// SalaryI18nUtil.getI18nLabel(100546, "删除个税扣缴义务人"), -// SalaryI18nUtil.getI18nLabel(100546, "删除个税扣缴义务人") + "：" + e.getName(), -// e)); + taxAgents.forEach(e ->{ + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(e.getId().toString()); + loggerContext.setTargetName(e.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除个税扣缴义务人")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除个税扣缴义务人")); + loggerContext.setOldValues(e); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); + }); return StringUtils.EMPTY; } diff --git a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java index c9eb8796a..7528418f8 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java @@ -2,17 +2,23 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationAnnualListDTO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationWageListDTO; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationDetailListQueryParam; import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.mapper.taxdeclaration.TaxDeclarationDetailMapper; +import com.engine.salary.service.TaxAgentService; import com.engine.salary.service.TaxDeclarationDetailService; import com.engine.salary.service.TaxDeclarationExcelService; import com.engine.salary.service.TaxDeclarationService; import com.engine.salary.util.JsonUtil; +import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtil; @@ -47,6 +53,10 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar return ServiceUtil.getService(TaxDeclarationServiceImpl.class, user); } + private TaxAgentService getTaxAgentService(User user) { + return ServiceUtil.getService(TaxAgentServiceImpl.class, user); + } + @Override @@ -128,6 +138,20 @@ public class TaxDeclarationExcelServiceImpl extends Service implements TaxDeclar } } } + + // 查询个税扣缴义务人名称 + String bar = "_"; + TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(taxDeclarationPO.getTaxAgentId()); + String targetName = SalaryDateUtil.getFormatYearMonth(taxDeclarationPO.getSalaryMonth()) + bar + taxAgentPO.getName() + bar + IncomeCategoryEnum.parseByValue(taxDeclarationPO.getIncomeCategory()).getDefaultLabel(); + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(taxDeclarationId.toString()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "导出个税申报表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "导出个税申报表")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); return ExcelUtil.genWorkbookV2(rows, sheetName); } diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java index 3835fe2f7..e44a9e345 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java @@ -3,6 +3,8 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; @@ -12,7 +14,9 @@ import com.engine.salary.entity.taxdeclaration.bo.TaxDeclarationBO; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam; import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; +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; @@ -259,6 +263,20 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration log.info("salary TaxDeclaration step4 AcctRecordStatus save {}", salaryAcctRecordIds.size()); } getSalaryAcctRecordService(user).updateStatusByIds(salaryAcctRecordIds, SalaryAcctRecordStatusEnum.DECLARED); + + // 记录日志 + result.getNeedInsertTaxDeclarations().stream().forEach(declare -> { + String taxAgentName = taxAgentNameMap.getOrDefault(declare.getTaxAgentId(), ""); + String targetName = SalaryDateUtil.getFormatYearMonth(declare.getSalaryMonth()) + " " + taxAgentName + " " + IncomeCategoryEnum.parseByValue(declare.getIncomeCategory()).getDefaultLabel(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(declare.getId().toString()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "生成个税申报表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "生成个税申报表")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); + }); } @Override @@ -334,5 +352,19 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration if(CollectionUtils.isNotEmpty(salaryAcctRecordIds)){ getSalaryAcctRecordService(user).updateStatusByIds(salaryAcctRecordIds,SalaryAcctRecordStatusEnum.ARCHIVED); } + + // 查询个税扣缴义务人名称 + String bar = "_"; + TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(po.getTaxAgentId()); + String targetName = SalaryDateUtil.getFormatYearMonth(po.getSalaryMonth()) + bar + taxAgentPO.getName() + bar + IncomeCategoryEnum.parseByValue(po.getIncomeCategory()).getDefaultLabel(); + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(taxDeclarationId.toString()); + loggerContext.setTargetName(targetName); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "撤回个税申报表")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "撤回个税申报表")); + SalaryElogConfig.taxDeclarationLoggerTemplate.write(loggerContext); } } diff --git a/src/com/engine/salary/util/SalaryLoggerUtil.java b/src/com/engine/salary/util/SalaryLoggerUtil.java index e6d49943f..6d35bd851 100644 --- a/src/com/engine/salary/util/SalaryLoggerUtil.java +++ b/src/com/engine/salary/util/SalaryLoggerUtil.java @@ -4,6 +4,7 @@ package com.engine.salary.util; import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.elog.util.LoggerTemplate; import com.engine.salary.enums.OperateTypeEnum; +import weaver.hrm.User; /** * 操作日志工具类 @@ -23,9 +24,10 @@ public class SalaryLoggerUtil { * @param operateTypeName * @param operatedesc * @param newValues + * @param user */ - public static void recordAddSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object newValues) { - recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.ADD.getValue(), operateTypeName, operatedesc, null, newValues); + public static void recordAddSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object newValues, User user) { + recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.ADD.getValue(), operateTypeName, operatedesc, null, newValues, user); } /** @@ -37,9 +39,10 @@ public class SalaryLoggerUtil { * @param operatedesc * @param oldValues * @param newValues + * @param user */ - public static void recordUpdateSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues, Object newValues) { - recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.UPDATE.getValue(), operateTypeName, operatedesc, oldValues, newValues); + public static void recordUpdateSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues, Object newValues, User user) { + recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.UPDATE.getValue(), operateTypeName, operatedesc, oldValues, newValues, user); } /** @@ -50,9 +53,23 @@ public class SalaryLoggerUtil { * @param operateTypeName * @param operatedesc * @param oldValues + * @param user */ - public static void recordDeleteSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues) { - recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.DELETE.getValue(), operateTypeName, operatedesc, oldValues, null); + public static void recordDeleteSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, Object oldValues, User user) { + recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.DELETE.getValue(), operateTypeName, operatedesc, oldValues, null, user); + } + + /** + * 记录单个对象导出操作日志 + * @param loggerTemplate + * @param targetId + * @param targetName + * @param operateTypeName + * @param operatedesc + * @param user + */ + public static void recordExportSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateTypeName, String operatedesc, User user) { + recoreSingleLog(loggerTemplate, targetId, targetName, OperateTypeEnum.EXCEL_EXPORT.getValue(), operateTypeName, operatedesc, null, null, user); } /** @@ -66,8 +83,9 @@ public class SalaryLoggerUtil { * @param oldValues * @param newValues */ - private static void recoreSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateType, String operateTypeName, String operatedesc, Object oldValues, Object newValues) { + private static void recoreSingleLog(LoggerTemplate loggerTemplate, Long targetId, String targetName, String operateType, String operateTypeName, String operatedesc, Object oldValues, Object newValues, User user) { LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(targetId)); loggerContext.setTargetName(targetName); loggerContext.setOperateType(operateType); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index 42faf9c9b..8b1ff0f6e 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -2,6 +2,8 @@ package com.engine.salary.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveItemFormDTO; import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; @@ -14,6 +16,7 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO; import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.enums.salaryarchive.SalaryArchiveItemAdjustReasonEnum; @@ -318,6 +321,16 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt m.setAdjustReason(SalaryArchiveItemAdjustReasonEnum.getDefaultLabelByValue(m.getAdjustReason())); }); + // 记录查看日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + // TODO 我的调薪记录setTargetId + // loggerContext.setTargetId(); + loggerContext.setTargetName("我的调薪记录"); + loggerContext.setOperateType(OperateTypeEnum.READ.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看调薪记录")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看调薪记录")); + SalaryElogConfig.myAdjustRecordLoggerTemplate.write(loggerContext); return list; } diff --git a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java index 38f53c4fb..5edef7f36 100644 --- a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java @@ -2,6 +2,8 @@ package com.engine.salary.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salaryformula.ExpressFormula; import com.engine.salary.entity.salaryitem.bo.SalaryItemBO; import com.engine.salary.entity.salaryitem.dto.SalaryFieldListDTO; @@ -11,10 +13,7 @@ import com.engine.salary.entity.salaryitem.param.SalaryItemSaveParam; import com.engine.salary.entity.salaryitem.param.SalaryItemSearchParam; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO; -import com.engine.salary.enums.SalaryOnOffEnum; -import com.engine.salary.enums.SalaryRoundingModeEnum; -import com.engine.salary.enums.SalarySystemTypeEnum; -import com.engine.salary.enums.SalaryValueTypeEnum; +import com.engine.salary.enums.*; import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.SalaryFormulaService; @@ -173,7 +172,17 @@ public class SalaryFieldWrapper extends Service { ValidUtil.doValidator(saveParam); validParam(saveParam); - getSalaryItemService(user).save(saveParam); + SalaryItemPO salaryItemPO = getSalaryItemService(user).save(saveParam); + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); + loggerContext.setTargetName(salaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建字段")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建字段") + ": " + salaryItemPO.getName()); + loggerContext.setNewValues(salaryItemPO); + SalaryElogConfig.salaryArchiveFieldLoggerTemplate.write(loggerContext); } private void validParam(SalaryItemSaveParam saveParam) { @@ -205,7 +214,20 @@ public class SalaryFieldWrapper extends Service { ValidUtil.doValidator(saveParam, RuntimeTypeEnum.UPDATE); validParam(saveParam); - getSalaryItemService(user).update(saveParam); + SalaryItemPO salaryItemPO = getSalaryItemService(user).update(saveParam); + + // 记录日志 + SalaryItemPO newSalaryItemPO = getSalaryItemService(user).getById(salaryItemPO.getId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); + loggerContext.setTargetName(newSalaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑字段")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑字段") + ": " + newSalaryItemPO.getName()); + loggerContext.setOldValues(salaryItemPO); + loggerContext.setNewValues(newSalaryItemPO); + SalaryElogConfig.salaryArchiveFieldLoggerTemplate.write(loggerContext); } /** diff --git a/src/com/engine/salary/wrapper/SalaryItemWrapper.java b/src/com/engine/salary/wrapper/SalaryItemWrapper.java index 1cf40c5da..12e333331 100644 --- a/src/com/engine/salary/wrapper/SalaryItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryItemWrapper.java @@ -3,6 +3,8 @@ package com.engine.salary.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.component.WeaFormOption; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.entity.salaryformula.ExpressFormula; import com.engine.salary.entity.salaryitem.bo.SalaryItemBO; import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO; @@ -221,7 +223,17 @@ public class SalaryItemWrapper extends Service { ValidUtil.doValidator(saveParam); validParam(saveParam); - getSalaryItemService(user).save(saveParam); + SalaryItemPO salaryItemPO = getSalaryItemService(user).save(saveParam); + // 记录日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(salaryItemPO.getId())); + loggerContext.setTargetName(salaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目") + ": " + salaryItemPO.getName()); + loggerContext.setNewValues(salaryItemPO); + SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); } private void validParam(SalaryItemSaveParam saveParam) { @@ -250,7 +262,20 @@ public class SalaryItemWrapper extends Service { public void update(SalaryItemSaveParam saveParam) { ValidUtil.doValidator(saveParam, RuntimeTypeEnum.UPDATE); validParam(saveParam); - getSalaryItemService(user).update(saveParam); + SalaryItemPO salaryItemPO = getSalaryItemService(user).update(saveParam); + + // 记录日志 + SalaryItemPO newSalaryItemPO = getSalaryItemService(user).getById(salaryItemPO.getId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId())); + loggerContext.setTargetName(newSalaryItemPO.getName()); + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑字段")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑字段") + ": " + newSalaryItemPO.getName()); + loggerContext.setOldValues(salaryItemPO); + loggerContext.setNewValues(newSalaryItemPO); + SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext); } /** From 75dd4235afe6d2558b9f821d6ecebdac61c02e27 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 22 Feb 2024 09:33:35 +0800 Subject: [PATCH 108/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E8=A1=A5=E7=BC=B4?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E5=B7=AE=E3=80=81=E9=80=80=E5=B7=AE=E9=A1=B5?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/SIAccountService.java | 4 +- .../service/impl/SIAccountServiceImpl.java | 152 ++++++++++++------ .../service/impl/SIArchivesServiceImpl.java | 12 ++ .../service/impl/SIBalanceServiceImpl.java | 43 ++++- .../impl/SICompensationServiceImpl.java | 8 +- .../service/impl/SIExportServiceImpl.java | 22 ++- .../service/impl/SIRecessionServiceImpl.java | 36 ++++- .../service/impl/SISchemeServiceImpl.java | 6 +- .../salary/web/SIAccountController.java | 4 +- 9 files changed, 220 insertions(+), 67 deletions(-) diff --git a/src/com/engine/salary/service/SIAccountService.java b/src/com/engine/salary/service/SIAccountService.java index 6a496845b..2dcb63401 100644 --- a/src/com/engine/salary/service/SIAccountService.java +++ b/src/com/engine/salary/service/SIAccountService.java @@ -123,9 +123,9 @@ public interface SIAccountService { /** * 删除补缴人员 - * @param supplementAccountBaseParams + * @param param */ - void deleteSummplementaryAccount(List supplementAccountBaseParams); + void deleteSupplementaryAccount(SaveCommonAccountParam param); /** * 台账归档 diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index a112960ab..9fb0a7314 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -670,11 +670,11 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } @Override - public void deleteSummplementaryAccount(List supplementAccountBaseParams) { + public void deleteSupplementaryAccount(SaveCommonAccountParam param) { // Long employeeId = (long) user.getUID(); // String currentUserName = user.getLastname(); // getSiAccountBiz(user).deleteSupplementaryAccount(supplementAccountBaseParams, employeeId, currentUserName); - siDeleteSupplementaryAccount(supplementAccountBaseParams); + siDeleteSupplementaryAccount(param); } @Override @@ -1854,6 +1854,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (updateInsuranceAccountDetailList.size() > 0) { refreshBillBatch(updateInsuranceAccountDetailList.get(0).getPaymentOrganization(), updateInsuranceAccountDetailList.get(0).getBillMonth()); //记录操作日志 + PaymentStatusEnum targetEnum = SalaryEnumUtil.enumMatchByValue(updateInsuranceAccountDetailList.get(0).getPaymentStatus(), PaymentStatusEnum.values(), PaymentStatusEnum.class); encryptUtil.decryptList(updateInsuranceAccountDetailList, InsuranceAccountDetailPO.class); InsuranceAccountBatchPO targetPO = getInsuranceAccountBatchMapper().getByBillMonth(updateInsuranceAccountDetailList.get(0).getBillMonth(), updateInsuranceAccountDetailList.get(0).getPaymentOrganization()); TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); @@ -1862,8 +1863,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); loggerContext.setOperateType(OperateTypeEnum.EXCEL_IMPORT.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-导入")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-导入") + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-导入") + + SalaryI18nUtil.getI18nLabel(targetEnum.getLabelId(), targetEnum.getDefaultLabel())); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-导入" + + SalaryI18nUtil.getI18nLabel(targetEnum.getLabelId(), targetEnum.getDefaultLabel())) + ":" + taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); updateInsuranceAccountDetailList.forEach(loggerContext::setNewValues); SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); @@ -3315,6 +3318,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } encryptUtil.decrypt(insuranceAccountDetailPO, InsuranceAccountDetailPO.class); + InsuranceAccountDetailPO oldTargetPO = new InsuranceAccountDetailPO(); + BeanUtils.copyProperties(insuranceAccountDetailPO, oldTargetPO); + accountSocialByData(insuranceAccountDetailPO, param); accountFundByData(insuranceAccountDetailPO, param); accountOtherByData(insuranceAccountDetailPO, param); @@ -3326,6 +3332,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { //刷新_bill_batch表中的统计信息 refreshBillBatch(insuranceAccountDetailPO.getPaymentOrganization(), insuranceAccountDetailPO.getBillMonth()); //记录操作日志 + PaymentStatusEnum targetEnum = SalaryEnumUtil.enumMatchByValue(insuranceAccountDetailPO.getPaymentStatus(), PaymentStatusEnum.values(), PaymentStatusEnum.class); encryptUtil.decrypt(insuranceAccountDetailPO, InsuranceAccountDetailPO.class); InsuranceAccountBatchPO targetPO = getInsuranceAccountBatchMapper().getByBillMonth(insuranceAccountDetailPO.getBillMonth(), insuranceAccountDetailPO.getPaymentOrganization()); TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); @@ -3334,10 +3341,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(taxAgentInfo.getName() + "-" + targetPO.getBillMonth() + "-" + empInfo.getUsername()); - loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-编辑")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-编辑") + loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-编辑") + + SalaryI18nUtil.getI18nLabel(targetEnum.getLabelId(), targetEnum.getDefaultLabel())); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-编辑" + + SalaryI18nUtil.getI18nLabel(targetEnum.getLabelId(), targetEnum.getDefaultLabel())) + ":" + taxAgentInfo.getName() + "-" + targetPO.getBillMonth() + "-" + empInfo.getUsername()); + loggerContext.setOldValues(oldTargetPO); loggerContext.setNewValues(insuranceAccountDetailPO); SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); } @@ -3747,6 +3757,20 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // getSiAccountBiz(user).updateByEmployeeIdAndBillMonth(po); updateByEmployeeIdAndBillMonth(po); } + //记录操作日志 + encryptUtil.decryptList(updateInsuranceAccountDetailList, InsuranceAccountDetailPO.class); + InsuranceAccountBatchPO targetPO = getInsuranceAccountBatchMapper().getByBillMonth(billMonth, paymentOrganization); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_IMPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-补差导入更新")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-补差导入更新") + + ":" + taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + updateInsuranceAccountDetailList.forEach(loggerContext::setNewValues); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); } if (createInsuranceAccountDetailList.size() > 0) { paymentOrganization = createInsuranceAccountDetailList.get(0).getPaymentOrganization(); @@ -3759,6 +3783,20 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { //新增 List> createPartition = Lists.partition((List) createInsuranceAccountDetailList, 20); createPartition.forEach(getInsuranceAccountDetailMapper()::batchSaveAccountDetails); + //记录操作日志 + encryptUtil.decryptList(createInsuranceAccountDetailList, InsuranceAccountDetailPO.class); + InsuranceAccountBatchPO targetPO = getInsuranceAccountBatchMapper().getByBillMonth(billMonth, paymentOrganization); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_IMPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-补差导入新增")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-补差导入新增") + + ":" + taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + createInsuranceAccountDetailList.forEach(loggerContext::setNewValues); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); } //刷新bill_batch表中统计信息 @@ -5414,19 +5452,19 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { insuranceAccountBatchPO.setOtherPay(otherSum.toPlainString()); encryptUtil.encrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); getInsuranceAccountBatchMapper().updateById(insuranceAccountBatchPO); - //记录操作日志 - encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); - TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(insuranceAccountBatchPO.getPaymentOrganization()); - LoggerContext loggerContext = new LoggerContext(); - loggerContext.setUser(user); - loggerContext.setTargetId(String.valueOf(insuranceAccountBatchPO.getId())); - loggerContext.setTargetName(taxAgentInfo.getName() + "-" + insuranceAccountBatchPO.getBillMonth()); - loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "更新福利台账")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更新福利台账") - + ":" + taxAgentInfo.getName() + "-" + insuranceAccountBatchPO.getBillMonth()); - loggerContext.setNewValues(insuranceAccountBatchPO); - SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); +// //记录操作日志 +// encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class); +// TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(insuranceAccountBatchPO.getPaymentOrganization()); +// LoggerContext loggerContext = new LoggerContext(); +// loggerContext.setUser(user); +// loggerContext.setTargetId(String.valueOf(insuranceAccountBatchPO.getId())); +// loggerContext.setTargetName(taxAgentInfo.getName() + "-" + insuranceAccountBatchPO.getBillMonth()); +// loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); +// loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "更新福利台账")); +// loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "更新福利台账") +// + ":" + taxAgentInfo.getName() + "-" + insuranceAccountBatchPO.getBillMonth()); +// loggerContext.setNewValues(insuranceAccountBatchPO); +// SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); } public void siFile(String billMonth, Long paymentOrganization) { @@ -6035,48 +6073,66 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // insuranceSchemeContext.setNewValues(item); // siAccountLoggerTemplate.write(insuranceSchemeContext); // }); + //记录操作日志 + encryptUtil.decryptList(pos, InsuranceAccountDetailPO.class); + InsuranceAccountBatchPO targetPO = getInsuranceAccountBatchMapper().getByBillMonth(pos.get(0).getBillMonth(), pos.get(0).getPaymentOrganization()); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + pos.forEach(targetDetailPO -> { + DataCollectionEmployee empInfo = getEmployMapper().getEmployeeById(targetDetailPO.getEmployeeId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId("" + targetPO.getId()); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + targetPO.getBillMonth() + "-" + empInfo.getUsername()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-新增补缴")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-新增补缴") + + ": " + taxAgentInfo.getName() + "-" + targetPO.getBillMonth() + "-" + empInfo.getUsername()); + loggerContext.setNewValues(targetDetailPO); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); + }); } public void siDeleteCommonAccount(SaveCommonAccountParam param) { ValidUtil.doValidator(param); - SalaryAssert.notEmpty(param.getIncludes(), SalaryI18nUtil.getI18nLabel(0, "参数错误")); //根据id批量删除 if (param.getIds().size() > 0) { getInsuranceAccountDetailMapper().batchDelAccountDetailsByIds(param.getIds()); } else { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "请勾选需要删除的数据项！")); } - //记录日志 -// LoggerContext insuranceSchemeContext = new LoggerContext(); -// insuranceSchemeContext.setTargetId(String.join(",", param.getIncludes().stream().map(item -> String.valueOf(item)).collect(Collectors.toList()))); -// insuranceSchemeContext.setTargetName(param.getBillMonth()); -// insuranceSchemeContext.setOperateType(OperateTypeEnum.ADD.getValue()); -// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100462, "新增台账")); -// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100462, "新增台账")); -// insuranceSchemeContext.setNewValues(param); -// siAccountLoggerTemplate.write(insuranceSchemeContext); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(param.getIds().stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setTargetName(param.getIds().stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除正常缴纳核算记录")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除正常缴纳核算记录")); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); + updateBatchAccount(AccountParam.builder().billMonth(param.getBillMonth()).paymentOrganization(param.getPaymentOrganization()).build()); } - public void siDeleteSupplementaryAccount(List param) { - SalaryAssert.notEmpty(param, SalaryI18nUtil.getI18nLabel(0, "参数错误")); - boolean valid = param.stream().anyMatch(item -> item.getEmployeeId() == null - || StringUtils.isBlank(item.getSupplementaryMonth()) - || StringUtils.isBlank(item.getBillMonth())); - if (valid) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "参数错误")); + public void siDeleteSupplementaryAccount(SaveCommonAccountParam param) { + ValidUtil.doValidator(param); + //根据id批量删除 + if (param.getIds().size() > 0) { + getInsuranceAccountDetailMapper().batchDelAccountDetailsByIds(param.getIds()); + } else { + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "请勾选需要删除的数据项！")); } - getInsuranceAccountDetailMapper().batchDelSupplementDetailsByIds(param); -// param.stream().forEach(item -> { -// LoggerContext insuranceSchemeContext = new LoggerContext(); -// insuranceSchemeContext.setTargetName(item.getBillMonth()); -// insuranceSchemeContext.setOperateType(OperateTypeEnum.DELETE.getValue()); -// insuranceSchemeContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100490, "删除补缴核算记录")); -// insuranceSchemeContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100490, "删除补缴核算记录")); -// insuranceSchemeContext.setNewValues(item); -// siAccountLoggerTemplate.write(insuranceSchemeContext); -// }); - updateBatchAccount(AccountParam.builder().billMonth(param.get(0).getBillMonth()).paymentOrganization(param.get(0).getPaymentOrganization()).build()); + getInsuranceAccountDetailMapper().batchDelAccountDetailsByIds(param.getIds()); + //记录操作日志 + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(param.getIds().stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setTargetName(param.getIds().stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除补缴核算记录")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除补缴核算记录")); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); + + updateBatchAccount(AccountParam.builder().billMonth(param.getBillMonth()).paymentOrganization(param.getPaymentOrganization()).build()); } public void accountInspect(Collection ids, String billMonth, Long paymentOrganization) { diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index a8aaa54c5..ec14fa7f9 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -2870,6 +2870,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .otherEndTime(org.apache.commons.lang.StringUtils.isNotBlank(param.getOtherEndTime()) ? param.getOtherEndTime() : null) .employeeId(param.getEmployeeId()) .deleteType(DeleteTypeEnum.NOT_DELETED.getValue()) + .createTime(oldOtherInfo.getCreateTime()) .updateTime(new Date()) .nonPayment(param.getNonPayment()) .creator(employeeId) @@ -2969,6 +2970,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-其他福利明细保存")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-其他福利明细保存") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + if (oldOtherInfoList.size() == 1) { + loggerContext.setOldValues(oldOtherInfoList.get(0)); + } loggerContext.setNewValues(targetDetailPO); SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); //生成福利档案基数调整记录数据 @@ -3032,6 +3036,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) .underTake(param.getUnderTake()) .paymentOrganization(param.getPaymentOrganization()) + .createTime(oldFundInfo.getCreateTime()) .updateTime(new Date()) .welfareType(paramReq.getWelfareType().getValue()) .employeeId(param.getEmployeeId()) @@ -3131,6 +3136,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-公积金明细保存")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-公积金明细保存") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + if (oldFundInfoList.size() == 1) { + loggerContext.setOldValues(oldFundInfoList.get(0)); + } loggerContext.setNewValues(targetDetailPO); SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); //生成福利档案基数调整记录数据 @@ -3197,6 +3205,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .nonPayment(param.getNonPayment()) .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) .employeeId(param.getEmployeeId()) + .createTime(oldSocialInfo.getCreateTime()) .updateTime(new Date()) .underTake(param.getUnderTake()) .socialAccount(param.getSchemeAccount()) @@ -3297,6 +3306,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案-社保明细保存")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利档案-社保明细保存") + ": " + taxAgentInfo.getName() + "-" + empInfo.getUsername()); + if (oldSocialInfoList.size() == 1) { + loggerContext.setOldValues(oldSocialInfoList.get(0)); + } loggerContext.setNewValues(targetDetailPO); SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); //生成福利档案基数调整记录数据 diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java index 28387d55c..6e746c358 100644 --- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java @@ -4,15 +4,20 @@ import com.alibaba.fastjson.JSON; import com.api.formmode.mybatis.util.SqlProxyHandle; 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.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.param.BalanceAccountBaseParam; import com.engine.salary.entity.siaccount.param.EditAccountDetailParam; import com.engine.salary.entity.siaccount.param.InspectAccountParam; +import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; import com.engine.salary.entity.siarchives.po.*; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.siaccount.BillStatusEnum; import com.engine.salary.enums.siaccount.PaymentStatusEnum; import com.engine.salary.enums.siaccount.ResourceFromEnum; @@ -21,6 +26,7 @@ import com.engine.salary.enums.sicategory.IsPaymentEnum; import com.engine.salary.enums.sicategory.PaymentScopeEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.siaccount.InsuranceAccountBatchMapper; import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; import com.engine.salary.mapper.siarchives.FundSchemeMapper; import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; @@ -28,6 +34,7 @@ import com.engine.salary.mapper.siarchives.OtherSchemeMapper; import com.engine.salary.mapper.siarchives.SocialSchemeMapper; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.SIAccountService; import com.engine.salary.service.SIBalanceService; import com.engine.salary.util.SalaryEntityUtil; @@ -87,6 +94,14 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { private EncryptUtil encryptUtil = new EncryptUtil(); + private InsuranceAccountBatchMapper getInsuranceAccountBatchMapper() { + return MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class); + } + + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + @Override public void del(InspectAccountParam param, Long employeeId) { @@ -98,7 +113,15 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { //根据id删除 List> partition = Lists.partition((List) param.getIds(), 100); partition.forEach(getInsuranceAccountDetailMapper()::batchDelAccountDetailsByIds); - + //记录操作日志 + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(param.getIds().stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setTargetName(param.getIds().stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除补差核算记录")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除补差核算记录")); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); //刷新bill_batch表中统计信息 getSIAccountService(user).refreshBillBatch(param.getPaymentOrganization(), param.getBillMonth()); } @@ -260,14 +283,14 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { Long creator = (long) user.getUID(); Long paymentOrganization = param.getPaymentOrganization(); - InsuranceAccountDetailPO banlanceAccountPO = getInsuranceAccountDetailMapper().getOneByBpep(InsuranceAccountDetailPO.builder() + InsuranceAccountDetailPO balanceAccountPO = getInsuranceAccountDetailMapper().getOneByBpep(InsuranceAccountDetailPO.builder() .billMonth(billMonth) .paymentStatus(PaymentStatusEnum.BALANCE.getValue()) .employeeId(employeeId) .paymentOrganization(paymentOrganization) .build()); - if (banlanceAccountPO != null) { + if (balanceAccountPO != null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "补差数据已存在，不可重复新增！")); } @@ -324,6 +347,20 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { //刷新bill_batch表中统计信息 getSIAccountService(user).refreshBillBatch(paymentOrganization, billMonth); + //记录操作日志 + encryptUtil.decrypt(insuranceAccountDetailPO, InsuranceAccountDetailPO.class); + InsuranceAccountBatchPO targetPO = getInsuranceAccountBatchMapper().getByBillMonth(billMonth, paymentOrganization); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-新增补差")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-新增补差") + + ":" + taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + loggerContext.setNewValues(insuranceAccountDetailPO); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); } else { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "补差数据中存在福利档案中未设置的福利项缴纳数值，请检查补差缴纳信息！")); } diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java index b7521eb82..b83448c67 100644 --- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java @@ -476,8 +476,8 @@ public class SICompensationServiceImpl extends Service implements SICompensation loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(taxAgentInfo.getName() + "-" + insuranceAccountDetailPO.getBillMonth() + "-" + empInfo.getUsername()); 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, "福利台账明细表-新增调差") + ":" + taxAgentInfo.getName() + "-" + insuranceAccountDetailPO.getBillMonth() + "-" + empInfo.getUsername()); loggerContext.setNewValues(insuranceCompensationPO); SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); @@ -530,8 +530,8 @@ public class SICompensationServiceImpl extends Service implements SICompensation loggerContext.setTargetId(String.valueOf(param.get(0).getPaymentOrganization())); loggerContext.setTargetName(taxAgentInfo.getName()); 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, "福利台账明细表-保存社保调差默认配置") + ":" + taxAgentInfo.getName()); configList.forEach(loggerContext::setNewValues); SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index f3432aa33..3ec48edbb 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.TypeReference; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; import com.engine.salary.entity.siaccount.param.InsuranceAccountDetailParam; @@ -13,6 +15,7 @@ import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.siexport.param.InsuranceExportParam; import com.engine.salary.entity.siexport.po.AccountExportPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.siaccount.BillStatusEnum; import com.engine.salary.enums.siaccount.PaymentStatusEnum; import com.engine.salary.enums.siaccount.ResourceFromEnum; @@ -149,8 +152,13 @@ public class SIExportServiceImpl extends Service implements SIExportService { rows.add(row); } excelSheetData.addAll(rows); - - + //记录操作日志 + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账-导出总览")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账-导出总览")); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); return ExcelUtil.genWorkbookV2(excelSheetData, sheetName); } @@ -248,6 +256,16 @@ public class SIExportServiceImpl extends Service implements SIExportService { } excelSheetData.addAll(rows); + //记录操作日志 + PaymentStatusEnum targetEnum = SalaryEnumUtil.enumMatchByValue(paymentStatus, PaymentStatusEnum.values(), PaymentStatusEnum.class); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-导出") + + SalaryI18nUtil.getI18nLabel(targetEnum.getLabelId(), targetEnum.getDefaultLabel())); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-导出") + + SalaryI18nUtil.getI18nLabel(targetEnum.getLabelId(), targetEnum.getDefaultLabel())); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); return ExcelUtilPlus.genWorkbookV2(excelSheetData, sheetName, total); } diff --git a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java index e9a446dac..494838d25 100644 --- a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON; import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.salary.config.SalaryElogConfig; +import com.engine.salary.elog.entity.dto.LoggerContext; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.hrm.dto.HrmInfoDTO; import com.engine.salary.entity.hrm.param.HrmQueryParam; @@ -12,6 +14,8 @@ import com.engine.salary.entity.siaccount.param.RecessionParam; import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.siaccount.BillStatusEnum; import com.engine.salary.enums.siaccount.PaymentStatusEnum; import com.engine.salary.enums.siaccount.ProjectTypeEnum; @@ -20,6 +24,7 @@ import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.datacollection.EmployMapper; import com.engine.salary.mapper.siaccount.InsuranceAccountBatchMapper; import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.SIAccountService; import com.engine.salary.service.SIRecessionService; import com.engine.salary.service.TaxAgentService; @@ -65,6 +70,11 @@ public class SIRecessionServiceImpl extends Service implements SIRecessionServic private InsuranceAccountBatchMapper getInsuranceAccountBatchMapper() { return MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class); } + + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + @Override public void save(RecessionParam param, Long employeeId) { @@ -112,13 +122,25 @@ public class SIRecessionServiceImpl extends Service implements SIRecessionServic //删除已有退差记录 finalRecessionDetails.forEach(getInsuranceAccountDetailMapper()::deleteRecessionData); - //入库新数据 List> partition = Lists.partition((List) finalRecessionDetails, 20); partition.forEach(getInsuranceAccountDetailMapper()::batchSaveAccountDetails); - //刷新bill_batch表中统计信息 getSIAccountService(user).refreshBillBatch(Long.valueOf(param.getPaymentOrganization()), param.getBillMonth()); + //记录操作日志 + encryptUtil.decryptList(finalRecessionDetails, InsuranceAccountDetailPO.class); + InsuranceAccountBatchPO targetPO = getInsuranceAccountBatchMapper().getByBillMonth(param.getBillMonth(), Long.valueOf(param.getPaymentOrganization())); + TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(targetPO.getPaymentOrganization()); + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(String.valueOf(targetPO.getId())); + loggerContext.setTargetName(taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-新增退差")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-新增退差") + + ":" + taxAgentInfo.getName() + "-" + targetPO.getBillMonth()); + finalRecessionDetails.forEach(loggerContext::setNewValues); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); } } @@ -137,7 +159,15 @@ public class SIRecessionServiceImpl extends Service implements SIRecessionServic //根据id删除 List> partition = Lists.partition((List) ids, 100); partition.forEach(getInsuranceAccountDetailMapper()::batchDelAccountDetailsByIds); - + //记录操作日志 + LoggerContext loggerContext = new LoggerContext(); + loggerContext.setUser(user); + loggerContext.setTargetId(ids.stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setTargetName(ids.stream().map(String::valueOf).collect(Collectors.joining(","))); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除退差核算记录")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利台账明细表-删除退差核算记录")); + SalaryElogConfig.siAccountLoggerTemplate.write(loggerContext); //刷新bill_batch表中统计信息 getSIAccountService(user).refreshBillBatch(refreshTargetPO.getPaymentOrganization(), refreshTargetPO.getBillMonth()); } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 491850815..5f921e0ba 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -632,7 +632,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { rows.add(row); } //记录操作日志 - LoggerContext loggerContext = new LoggerContext<>(); + LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); loggerContext.setOperateType(OperateTypeEnum.EXCEL_EXPORT.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "福利档案导出")); @@ -2511,7 +2511,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { getInsuranceSchemeMapper().update(insuranceSchemePO1); //记录主表操作日志 loggerContext.setNewValues(insuranceSchemePO1); - SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); + SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); //更新福利方案明细表 先删后插 getInsuranceSchemeDetailMapper().batchDeleteByPrimaryIds(Collections.singleton(updateParam.getInsuranceScheme().getId())); //更新明细表 @@ -2527,7 +2527,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceSchemeDetailContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "修改福利方案明细表")); insuranceSchemeDetailContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "福利方案明细")); insuranceSchemeDetailPOS.forEach(insuranceSchemeDetailContext::setNewValues); - SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(insuranceSchemeDetailContext); + SalaryElogConfig.siSchemeLoggerTemplate.write(insuranceSchemeDetailContext); } diff --git a/src/com/engine/salary/web/SIAccountController.java b/src/com/engine/salary/web/SIAccountController.java index ab9a41c9c..4e49abfa9 100644 --- a/src/com/engine/salary/web/SIAccountController.java +++ b/src/com/engine/salary/web/SIAccountController.java @@ -315,9 +315,9 @@ public class SIAccountController { @Path("/supplementary/delete") @Produces(MediaType.APPLICATION_JSON) public String deleteSummplementaryAccount(@Context HttpServletRequest request, @Context HttpServletResponse response, - @RequestBody List param) { + @RequestBody SaveCommonAccountParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult, String>(user).run(getService(user)::deleteSummplementaryAccount, param); + return new ResponseResult(user).run(getService(user)::deleteSupplementaryAccount, param); } From f591074fc15c7b66e2f9b21608665dc0fe3c1fb1 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 22 Feb 2024 09:43:47 +0800 Subject: [PATCH 109/169] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salarysob/po/SalarySobItemPO.java | 2 ++ .../entity/salarysob/po/SalarySobPO.java | 34 +++++++++++++++++++ .../impl/SalarySobItemServiceImpl.java | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java index e3167bc23..47d8938ef 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salarysob.po; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.enums.SalaryRoundingModeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; import lombok.AllArgsConstructor; @@ -23,6 +24,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor //hrsa_salary_sob_item +@ElogTransform( name="薪资账套薪资项目" ) public class SalarySobItemPO { /** diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java index 921fad01c..68712f06c 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salarysob.po; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,77 +18,110 @@ import java.util.Date; @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor +@ElogTransform( name="薪资账套" ) //hrsa_salary_sob public class SalarySobPO { + /** * 主键id */ + @ElogTransform( name="主键" ) private Long id; + /** * 名称 */ + @ElogTransform( name="名称" ) private String name; /** * 个税扣缴义务人的主键id */ + @ElogTransform( name="个税扣缴义务人id" ) private Long taxAgentId; /** * 应税项目。1:正常工资薪金所得 */ + @ElogTransform( name="薪资类型" ) private Integer incomeCategory; + /** * 薪资周期。1:上上月、2:上月、3:本月、4:下月 */ + @ElogTransform( name="薪资周期" ) private Integer salaryCycleType; + /** * 薪资周期的起始日期 */ + @ElogTransform( name="薪资周期起始日期" ) private Integer salaryCycleFromDay; + /** * 税款所属期。1:上上月、2:上月、3:本月、4:下月 */ + @ElogTransform( name="税款所属期" ) private Integer taxCycleType; + /** * 考勤周期。1:上上月、2:上月、3:本月、4:下月 */ + @ElogTransform( name="考勤周期" ) private Integer attendCycleType; + /** * 考勤周期的起始日期 */ + @ElogTransform( name="考勤周期起始日期" ) private Integer attendCycleFromDay; + /** * 社保福利所属期。1:上上月、2:上月、3:本月、4:下月 */ + @ElogTransform( name="社保福利所属期" ) private Integer socialSecurityCycleType; + /** * 是否禁用。0：正常使用、1：禁用 */ + @ElogTransform( name="是否禁用" ) private Integer disable; + /** * 描述 */ + @ElogTransform( name="描述" ) private String description; + /** * 创建人 */ + @ElogTransform( name="创建人" ) private Long creator; + /** * 创建时间 */ + @ElogTransform( name="创建时间" ) private Date createTime; + /** * 更新时间 */ + @ElogTransform( name="更新时间" ) private Date updateTime; + /** * 是否已删除。0：未删除、1：已删除 */ + @ElogTransform( name="是否已删除" ) private Integer deleteType; + /** * 租户ID */ + @ElogTransform( name="租户" ) private String tenantKey; Collection ids; diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java index 8a90a0049..93de141bc 100644 --- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java @@ -269,7 +269,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe loggerContext.setUser(user); loggerContext.setTargetId("" + salarySob.getId()); loggerContext.setTargetName(salarySob.getName()); - loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套薪资项目")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套薪资项目")); SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext); From 1654e041b94797594b30c0733f6d043c28e694a4 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 22 Feb 2024 15:23:59 +0800 Subject: [PATCH 110/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SIArchivesServiceImpl.java | 4 ++-- .../engine/salary/service/impl/SISchemeServiceImpl.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index ec14fa7f9..d0e099fdc 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -200,7 +200,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService + ": " + "人员id" + "-" + employeeId + "," + "个税扣缴义务人id" + "-" +paymentOrganization + "," + (welfareTypeEnum == null ? SalaryI18nUtil.getI18nLabel(0, "员工基本信息") : SalaryI18nUtil.getI18nLabel(welfareTypeEnum.getLabelId(), welfareTypeEnum.getDefaultLabel()))); - SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); return apidatas; } @@ -227,7 +227,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看缴纳基数明细") + ": " + "人员id" + "-" + employeeId + "," + "个税扣缴义务人id" + "-" +paymentOrganization + "," + SalaryI18nUtil.getI18nLabel(welfareTypeEnum.getLabelId(), welfareTypeEnum.getDefaultLabel())); - SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); + SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext); return apidatas; } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 5f921e0ba..1f1b16230 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -2456,7 +2456,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (insuranceSchemeDetailPOS.size() > 0) { encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - LoggerContext> loggerContext = new LoggerContext<>(); + LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(targetPO.getSchemeName()); @@ -2520,7 +2520,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceSchemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::insert); //记录明细表操作日志 encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - LoggerContext> insuranceSchemeDetailContext = new LoggerContext<>(); + LoggerContext insuranceSchemeDetailContext = new LoggerContext<>(); insuranceSchemeDetailContext.setTargetId(String.valueOf(insuranceSchemePO.getId())); insuranceSchemeDetailContext.setTargetName(insuranceSchemePO.getSchemeName()); insuranceSchemeDetailContext.setOperateType(OperateTypeEnum.UPDATE.getValue()); @@ -2572,8 +2572,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { SalaryElogConfig.siSchemeLoggerTemplate.write(loggerContext); //记录明细表操作日志 List targetDetails = targetDetailMap.get(targetPO.getId()); + encryptUtil.decryptList(targetDetails, InsuranceSchemeDetailPO.class); if (targetDetails != null && targetDetails.size() > 0) { - LoggerContext> detailLoggerContext = new LoggerContext<>(); + LoggerContext detailLoggerContext = new LoggerContext<>(); detailLoggerContext.setUser(user); detailLoggerContext.setTargetId(String.valueOf(targetPO.getId())); detailLoggerContext.setTargetName(targetPO.getSchemeName()); @@ -2673,7 +2674,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (detailPOS.size() > 0) { encryptUtil.decryptList(detailPOS, InsuranceSchemeDetailPO.class); - LoggerContext> loggerContext = new LoggerContext<>(); + LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); loggerContext.setTargetId(String.valueOf(targetPO.getId())); loggerContext.setTargetName(targetPO.getSchemeName()); From a39806bb923db1029cbb1b1b8fb700dc183dfca8 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 23 Feb 2024 11:04:14 +0800 Subject: [PATCH 111/169] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=98=BE=E7=A4=BA=E9=A1=B5=E7=AD=BE=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/web/MySalaryShowSetController.java | 13 ++++++ .../salaryBill/dto/MySalaryShowSetDTO.java | 40 +++++++++++++++++ .../service/MySalaryShowSetService.java | 19 ++++++++ .../impl/MySalaryShowSetServiceImpl.java | 44 ++++++++++++++++++ .../sys/constant/SalarySysConstant.java | 15 +++++++ .../salary/web/MySalaryShowSetController.java | 45 +++++++++++++++++++ .../wrapper/MySalaryShowSetWrapper.java | 32 +++++++++++++ .../salary/wrapper/SalarySendWrapper.java | 5 ++- 8 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 src/com/api/salary/web/MySalaryShowSetController.java create mode 100644 src/com/engine/salary/entity/salaryBill/dto/MySalaryShowSetDTO.java create mode 100644 src/com/engine/salary/service/MySalaryShowSetService.java create mode 100644 src/com/engine/salary/service/impl/MySalaryShowSetServiceImpl.java create mode 100644 src/com/engine/salary/web/MySalaryShowSetController.java create mode 100644 src/com/engine/salary/wrapper/MySalaryShowSetWrapper.java diff --git a/src/com/api/salary/web/MySalaryShowSetController.java b/src/com/api/salary/web/MySalaryShowSetController.java new file mode 100644 index 000000000..0be912245 --- /dev/null +++ b/src/com/api/salary/web/MySalaryShowSetController.java @@ -0,0 +1,13 @@ +package com.api.salary.web; + +import javax.ws.rs.Path; + +/** + * @Description: 我的薪资福利显示设置 + * @Author: wangxiangzhong + * @Date: 2021-12-08 14:44 + */ +@Path("/bs/hrmsalary/mySalaryShowSet") +public class MySalaryShowSetController extends com.engine.salary.web.MySalaryShowSetController { + +} diff --git a/src/com/engine/salary/entity/salaryBill/dto/MySalaryShowSetDTO.java b/src/com/engine/salary/entity/salaryBill/dto/MySalaryShowSetDTO.java new file mode 100644 index 000000000..7ca948821 --- /dev/null +++ b/src/com/engine/salary/entity/salaryBill/dto/MySalaryShowSetDTO.java @@ -0,0 +1,40 @@ +package com.engine.salary.entity.salaryBill.dto; + +import io.swagger.annotations.ApiModel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description: 我的薪资福利显示设置 + * @Author: wangxiangzhong + * @Date: 2023/8/7 13:05 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("工资单确认和反馈") +public class MySalaryShowSetDTO { + + /** + * 是否显示工资单列表 + */ + private Boolean salaryShowStatus; + + /** + * 是否显示社保福利列表 + */ + // private Boolean welfareShowStatus; + + /** + * 是否显示调薪记录列表 + */ + private Boolean adjustShowStatus; + + /** + * 是否显示个税扣缴义务人列 + */ + private Boolean taxAgentShowStatus; +} diff --git a/src/com/engine/salary/service/MySalaryShowSetService.java b/src/com/engine/salary/service/MySalaryShowSetService.java new file mode 100644 index 000000000..3bfea6d7b --- /dev/null +++ b/src/com/engine/salary/service/MySalaryShowSetService.java @@ -0,0 +1,19 @@ +package com.engine.salary.service; + + +import com.engine.salary.entity.salaryBill.dto.MySalaryShowSetDTO; + +/** + * @Description: 我的薪资福利显示设置 + * @Author: wangxiangzhong + * @Date: 2023/8/7 11:15 + */ +public interface MySalaryShowSetService { + + /** + * 获取显示设置 + * + * @return + */ + MySalaryShowSetDTO get(); +} diff --git a/src/com/engine/salary/service/impl/MySalaryShowSetServiceImpl.java b/src/com/engine/salary/service/impl/MySalaryShowSetServiceImpl.java new file mode 100644 index 000000000..57ec01bda --- /dev/null +++ b/src/com/engine/salary/service/impl/MySalaryShowSetServiceImpl.java @@ -0,0 +1,44 @@ +package com.engine.salary.service.impl; + + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.salary.entity.salaryBill.dto.MySalaryShowSetDTO; +import com.engine.salary.service.MySalaryShowSetService; +import com.engine.salary.sys.constant.SalarySysConstant; +import com.engine.salary.sys.entity.po.SalarySysConfPO; +import com.engine.salary.sys.service.SalarySysConfService; +import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.math.NumberUtils; +import weaver.hrm.User; + +/** + * @Description: 我的薪资福利显示设置 + * @Author: wangxiangzhong + * @Date: 2023/8/7 11:16 + */ +@Slf4j +public class MySalaryShowSetServiceImpl extends Service implements MySalaryShowSetService { + + private SalarySysConfService getSalarySysConfService(User user) { + return ServiceUtil.getService(SalarySysConfServiceImpl.class, user); + } + + /** + * 获取显示设置 + * + * @return + */ + @Override + public MySalaryShowSetDTO get() { + SalarySysConfPO salaryShowStatus = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_SHOW_STATUS); + SalarySysConfPO adjustShowStatus = getSalarySysConfService(user).getOneByCode(SalarySysConstant.ADJUST_SHOW_STATUS); + + return MySalaryShowSetDTO.builder() + .salaryShowStatus(salaryShowStatus == null ? true : NumberUtils.INTEGER_ONE.equals(salaryShowStatus.getConfValue())) + .adjustShowStatus(adjustShowStatus == null ? true : NumberUtils.INTEGER_ONE.equals(adjustShowStatus.getConfValue())) + .build(); + } + +} diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index afe54d3c0..34a6b29ec 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -115,4 +115,19 @@ public class SalarySysConstant { * 应用设置是否福利档案导入时，不符合上下限的基数调整为上限 /下限 */ public static final String WEL_BASE_AUTO_ADJUST = "welBaseAutoAdjust"; + + /** + * 我的薪资福利工资单显示状态 + */ + public static final String SALARY_SHOW_STATUS = "salaryShowStatus"; + + /** + * 我的薪资福利调薪记录显示状态 + */ + public static final String ADJUST_SHOW_STATUS = "adjustShowStatus"; + + /** + * 我的薪资福利工资单个税扣缴义务人显示状态 + */ + public static final String TAX_AGENT_SHOW_STATUS = "taxAgentShowStatus"; } diff --git a/src/com/engine/salary/web/MySalaryShowSetController.java b/src/com/engine/salary/web/MySalaryShowSetController.java new file mode 100644 index 000000000..538d951ae --- /dev/null +++ b/src/com/engine/salary/web/MySalaryShowSetController.java @@ -0,0 +1,45 @@ +package com.engine.salary.web; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.salaryBill.dto.MySalaryShowSetDTO; +import com.engine.salary.util.ResponseResult; +import com.engine.salary.wrapper.MySalaryShowSetWrapper; +import lombok.extern.slf4j.Slf4j; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; + +/** + * @Description: 我的薪资福利显示设置 + * @Author: wangxiangzhong + * @Date: 2021-12-08 14:44 + */ +@Slf4j +public class MySalaryShowSetController { + + private MySalaryShowSetWrapper getMySalaryShowSetWrapper(User user) { + return ServiceUtil.getService(MySalaryShowSetWrapper.class, user); + } + + /** + * 我的薪资福利页签显隐控制 + * + * @return + */ + @GET + @Path("/get") + @Produces(MediaType.APPLICATION_JSON) + public String mySalaryShowSet(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getMySalaryShowSetWrapper(user)::mySalaryShowSet); + } + + /******** 工资单 end ***********************************************************************************************/ +} diff --git a/src/com/engine/salary/wrapper/MySalaryShowSetWrapper.java b/src/com/engine/salary/wrapper/MySalaryShowSetWrapper.java new file mode 100644 index 000000000..4efbd70cb --- /dev/null +++ b/src/com/engine/salary/wrapper/MySalaryShowSetWrapper.java @@ -0,0 +1,32 @@ +package com.engine.salary.wrapper; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.salary.entity.salaryBill.dto.MySalaryShowSetDTO; +import com.engine.salary.service.MySalaryShowSetService; +import com.engine.salary.service.impl.MySalaryShowSetServiceImpl; +import org.springframework.stereotype.Component; +import weaver.hrm.User; + +; + +/** + * @Description: 我的薪资福利显示设置 + * @Author: wangxiangzhong + * @Date: 2023/8/7 11:24 + */ +@Component +public class MySalaryShowSetWrapper extends Service { + private MySalaryShowSetService getMySalaryShowSetService(User user) { + return ServiceUtil.getService(MySalaryShowSetServiceImpl.class, user); + } + + /** + * 获取我的薪资福利显示设置 + * + * @return + */ + public MySalaryShowSetDTO mySalaryShowSet() { + return getMySalaryShowSetService(user).get(); + } +} diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 75c83f012..4f57185f8 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -620,11 +620,14 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy } private List buildMySalaryBillListColumns() { + SalarySysConfPO taxAgentShowStatusPO = getSalarySysConfService(user).getOneByCode(SalarySysConstant.TAX_AGENT_SHOW_STATUS); List list = new ArrayList<>(); WeaTableColumn idColumn = new WeaTableColumn("0px", "id", "id"); idColumn.setDisplay(WeaBoolAttr.TRUE); list.add(new WeaTableColumn("20%", "薪资所属月", "salaryYearMonth")); - list.add(new WeaTableColumn("40%", "个税扣缴义务人", "taxAgent")); + if (taxAgentShowStatusPO == null || taxAgentShowStatusPO.getConfValue().equals("1")) { + list.add(new WeaTableColumn("40%", "个税扣缴义务人", "taxAgent")); + } list.add(new WeaTableColumn("40%", "发放时间", "sendTime")); return list; } From dce7f684a5cc396912d006b315955bd9587d3901 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 23 Feb 2024 11:34:48 +0800 Subject: [PATCH 112/169] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=86=E6=9D=83=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/SIAccountServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 857196426..f4a03e1c9 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -241,8 +241,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (CollectionUtils.isEmpty(taxAgents)) { //防止普通用户查询 queryParam.setTaxAgents(Collections.singletonList(-1L)); - } else if (paymentOrganizationIds != null && paymentOrganizationIds.size() > 0){ - taxAgents.retainAll(paymentOrganizationIds); + } else { + if (paymentOrganizationIds != null && paymentOrganizationIds.size() > 0) { + taxAgents.retainAll(paymentOrganizationIds); + } queryParam.setTaxAgents(taxAgents); } } From 4775d8683aa60ed35c120b61428679094377ebf9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 23 Feb 2024 11:42:36 +0800 Subject: [PATCH 113/169] =?UTF-8?q?fix=E8=B0=83=E8=96=AA=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?value=E5=80=BC=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryarchive/SalaryArchiveItemAdjustReasonEnum.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java index fb3f761cc..626635040 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java @@ -19,9 +19,9 @@ public enum SalaryArchiveItemAdjustReasonEnum implements BaseEnum { ONBOARD("ONBOARD", "入职", 85901), PROBATION_REVIEW("PROBATION_REVIEW", "转正", 85984), SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985), - PROMOTION("SALARY_ADJUSTMENT", "晋升", 85985), - DEMOTION("SALARY_ADJUSTMENT", "降职", 85985), - JOB_TRANSFER("SALARY_ADJUSTMENT", "调岗", 85985), + PROMOTION("PROMOTION", "晋升", 85985), + DEMOTION("DEMOTION", "降职", 85985), + JOB_TRANSFER("JOB_TRANSFER", "调岗", 85985), POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", "调岗调薪", 85986), DIMISSION("DIMISSION", "离职", 85902), OTHER("OTHER", "其他", 84500), From 093cb34f779aeecdaefbd754f1414c573984595e Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 23 Feb 2024 15:11:56 +0800 Subject: [PATCH 114/169] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97fix?= =?UTF-8?q?=20some=20bugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/biz/AttendQuoteDataValueBiz.java | 2 +- .../salary/biz/SpecialAddDeductionBiz.java | 3 +++ .../po/SpecialAddDeductionPO.java | 23 +++++++++++++++++-- .../salaryacct/po/SalaryAcctRecordPO.java | 15 ++++++++++++ .../datacollection/OtherDeductionMapper.xml | 7 ++++++ .../SpecialAddDeductionMapper.xml | 4 ++-- .../SalaryStatisticsReportWrapper.java | 14 +++++++++++ .../impl/AddUpSituationServiceImpl.java | 3 +++ .../service/impl/AttendQuoteServiceImpl.java | 13 +++++------ .../impl/OtherDeductionServiceImpl.java | 4 ++++ .../impl/SalaryArchiveServiceImpl.java | 5 ++-- .../service/impl/SalarySobServiceImpl.java | 21 +++++++++-------- .../impl/TaxAgentManageRangeServiceImpl.java | 4 ++-- .../impl/TaxDeclarationServiceImpl.java | 1 + 14 files changed, 93 insertions(+), 26 deletions(-) diff --git a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java index 5082f23d0..f80b1aa36 100644 --- a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java +++ b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java @@ -67,7 +67,7 @@ public class AttendQuoteDataValueBiz { } } - public void deleteByAttendQuoteIds(ArrayList quoteIds) { + public void deleteByAttendQuoteIds(List quoteIds) { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AttendQuoteDataValueMapper mapper = sqlSession.getMapper(AttendQuoteDataValueMapper.class); diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java index ad02398de..bf6f87f0a 100644 --- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java +++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java @@ -179,6 +179,9 @@ public class SpecialAddDeductionBiz extends BaseBean { if (CollectionUtils.isNotEmpty(updateList)) { LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); + if(updateList.size() == 1) { + loggerContext.setTargetId(updateList.get(0).getId().toString()); + } loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "专项附加扣除 ")); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入")); diff --git a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java index 75c896062..afa5ea4e9 100644 --- a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java @@ -1,14 +1,15 @@ package com.engine.salary.entity.datacollection.po; import com.engine.salary.annotation.Encrypt; +import com.engine.salary.elog.annotation.ElogTransform; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import java.util.Collection; import java.util.Date; -import java.util.List; /** * 数据采集-专项附加扣除表 @@ -18,85 +19,103 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Accessors(chain = true) +@ElogTransform( name = "专项附加扣除" ) public class SpecialAddDeductionPO { + @ElogTransform( name="主键" ) private Long id; /** * 人员信息表的主键id */ + @ElogTransform( name="人员id" ) private Long employeeId; /** * 个税扣缴义务人的主键id */ + @ElogTransform( name="个税扣缴义务人id" ) private Long taxAgentId; /** * 子女教育 */ + @ElogTransform( name="子女教育" ) @Encrypt private String childrenEducation; /** * 继续教育 */ + @ElogTransform( name="继续教育" ) @Encrypt private String continuingEducation; /** * 住房贷款利息 */ + @ElogTransform( name="住房贷款利息" ) @Encrypt private String housingLoanInterest; /** * 住房租金 */ + @ElogTransform( name="住房租金" ) @Encrypt private String housingRent; /** * 赡养老人 */ + @ElogTransform( name="赡养老人" ) @Encrypt private String supportingElder; /** * 大病医疗 */ + @ElogTransform( name="大病医疗" ) @Encrypt private String seriousIllnessTreatment; /** * 婴幼儿照护 */ + @ElogTransform( name="婴幼儿照护" ) @Encrypt private String infantCare; /** * 创建时间 */ + @ElogTransform( name="创建时间" ) private Date createTime; /** * 更新时间 */ + @ElogTransform( name="更新时间" ) private Date updateTime; /** * 创建人 */ + @ElogTransform( name="创建人" ) private Long creator; /** * 是否已删除。0：未删除、1：已删除 */ + @ElogTransform( name="是否已删除" ) private Integer deleteType; /** * 租户ID */ + @ElogTransform( name="租户" ) private String tenantKey; - private List employeeIds; + private Collection employeeIds; + + private Collection ids; } \ No newline at end of file diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java index 9587048ee..3af046bdb 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salaryacct.po; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.elog.annotation.ElogTransform; import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -25,43 +26,51 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder +@ElogTransform( name = "薪资核算记录" ) //hrsa_salary_acct_record public class SalaryAcctRecordPO { /** * 主键id */ + @ElogTransform( name = "主键id" ) private Long id; /** * 薪资所属月 */ + @ElogTransform( name = "薪资所属月" ) private Date salaryMonth; /** * 税款所属期 */ + @ElogTransform( name = "税款所属期" ) private Date taxCycle; /** * 薪资账套id */ + @ElogTransform( name = "薪资账套id" ) private Long salarySobId; /** * 核算状态 * @see SalaryAcctRecordStatusEnum */ + @ElogTransform( name = "核算状态" ) private Integer status; /** * 本次核算是账套（salarySobId）在本月（salaryMonth）的第几次核算 */ + @ElogTransform( name = "核算次数" ) private Integer acctTimes; /** * 是否是回算 0：不是回算、1：是回算 */ + @ElogTransform( name = "是否是回算" ) private Integer backCalcStatus; /** @@ -81,31 +90,37 @@ public class SalaryAcctRecordPO { /** * 备注 */ + @ElogTransform( name = "备注" ) private String description; /** * 租户key */ + @ElogTransform( name = "租户key" ) private String tenantKey; /** * 创建人id */ + @ElogTransform( name = "创建人id" ) private Long creator; /** * 是否删除 */ + @ElogTransform( name = "是否删除" ) private Integer deleteType; /** * 创建时间 */ + @ElogTransform( name = "创建时间" ) private Date createTime; /** * 更新时间 */ + @ElogTransform( name = "更新时间" ) private Date updateTime; /** diff --git a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml index 2d377e0ea..0afae02a2 100644 --- a/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/OtherDeductionMapper.xml @@ -464,6 +464,13 @@ + + + + when id=#{item.id} then #{item.updateTime} + + + where id in diff --git a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml index 2d32ec009..ce701f1d9 100644 --- a/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/SpecialAddDeductionMapper.xml @@ -694,7 +694,7 @@ + select version from hrsa_elog_version where maintable = #{mainTable} + + + create table ${mainTable} + ( + id bigint comment 'ID', + create_time datetime default current_timestamp , + update_time datetime default current_timestamp , + creator bigint, + delete_type int, + tenant_key varchar(10), + uuid char(36), + log_date datetime default current_timestamp , + log_operator varchar(50), + operatorName varchar(50), + targetId varchar(50), + targetName text, + modulename varchar(100), + functionname varchar(100), + interfaceName varchar(100), + requesturl varchar(200), + requesturi varchar(200), + operateType varchar(50), + operatetypename varchar(100), + operatedesc varchar(1000), + params longtext, + belongmainid varchar(36), + clientIp varchar(50), + groupid varchar(50), + device varchar(200), + groupNameLabel varchar(500), + redoService varchar(200), + redoContext longtext, + cancelService varchar(200), + cancelContext longtext, + totalruntime bigint, + mainruntime bigint, + log_result varchar(100), + fromterminal varchar(100), + resultdesc text, + old_content varchar(1000), + link_type varchar(20), + link_id bigint, + old_link_id bigint, + PRIMARY KEY (id) + ) + + + + create table ${mainTable} + ( + id number(*,0) not null primary key, + create_time date default sysdate, + update_time date default sysdate, + creator number(*,0), + delete_type number(*,0), + tenant_key varchar2(10), + uuid varchar2(36), + log_date date default sysdate, + log_operator varchar2(50), + operatorName varchar2(50), + targetId varchar2(50), + targetName varchar2(4000), + modulename varchar2(100), + functionname varchar2(100), + interfaceName varchar2(100), + requesturl varchar2(200), + requesturi varchar2(200), + operateType varchar2(50), + operatetypename varchar2(100), + operatedesc varchar2(1000), + params clob, + belongmainid varchar2(36), + clientIp varchar2(200), + groupid varchar2(50), + device varchar2(200), + groupNameLabel varchar2(500), + redoService varchar2(200), + redoContext varchar2(4000), + cancelService varchar2(200), + cancelContext varchar2(4000), + totalruntime number(*,0), + mainruntime number(*,0), + log_result varchar2(4000), + fromterminal varchar2(100), + resultdesc varchar2(4000), + old_content varchar2(1000), + link_type varchar2(20), + link_id number(*,0), + old_link_id number(*,0) + ) + + + create table ${mainTable} + ( + id bigint not null primary key, + create_time datetime default getdate(), + update_time datetime default getdate(), + creator bigint default '-1', + delete_type bigint default 0, + tenant_key nvarchar(10), + uuid nvarchar(36), + log_date datetime default getdate(), + device nvarchar(500), + log_operator bigint default '-1', + operatorname nvarchar(100), + targetid bigint default '-1', + targetname nvarchar(3000), + modulename nvarchar(100), + functionname nvarchar(100), + interfacename nvarchar(100), + requesturl nvarchar(200), + requesturi nvarchar(200), + operatetype nvarchar(50), + operatetypename nvarchar(100), + operatedesc nvarchar(3000), + params nvarchar(max), + belongmainid nvarchar(36), + clientip nvarchar(200), + groupid nvarchar(50), + groupnamelabel nvarchar(1000), + redoservice nvarchar(200), + redocontext nvarchar(3000), + cancelservice nvarchar(200), + cancelcontext nvarchar(3000), + totalruntime bigint default 0, + mainruntime bigint default 0, + log_result nvarchar(100), + fromterminal nvarchar(100), + resultdesc nvarchar(3000), + old_content nvarchar(3000), + link_type nvarchar(20), + link_id bigint default 0, + old_link_id bigint default 0 + ) + + + create table ${mainTable} + ( + id int8 not null primary key, + create_time timestamp default current_timestamp, + update_time timestamp default current_timestamp, + creator int8, + delete_type int, + tenant_key varchar(10), + uuid varchar(36), + log_date timestamp default current_timestamp, + log_operator varchar(50), + operatorName varchar(50), + targetId varchar(50), + targetName text, + modulename varchar(100), + functionname varchar(100), + interfaceName varchar(100), + requesturl varchar(200), + requesturi varchar(200), + operateType varchar(50), + operatetypename varchar(100), + operatedesc varchar(1000), + params text, + belongmainid varchar(36), + clientIp varchar(200), + groupid varchar(50), + device varchar(200), + groupNameLabel varchar(500), + redoService varchar(200), + redoContext text, + cancelService varchar(200), + cancelContext text, + totalruntime int4, + mainruntime int4, + log_result varchar(100), + fromterminal varchar(100), + resultdesc text, + old_content varchar(1000), + link_type varchar(20), + link_id int4, + old_link_id int4 + ) + + + create table ${detailTable} + ( + id bigint not null primary key, + create_time datetime default current_timestamp , + update_time datetime default current_timestamp , + creator bigint, + delete_type int, + tenant_key varchar(10), + uuid varchar(36), + mainid varchar(36), + dataid varchar(50), + belongdataid varchar(50), + tableName varchar(200), + tablenamelabelid varchar(50), + tablenamedesc varchar(50), + fieldName varchar(200), + fieldnamelabelid varchar(200), + newValue longtext, + oldValue longtext, + newrealvalue longtext, + oldrealvalue longtext, + fieldDesc varchar(200), + showorder int default 0, + isdetail int default 0 + ) + + + create table ${detailTable} + ( + id int8 not null primary key, + create_time timestamp default current_timestamp , + update_time timestamp default current_timestamp , + creator int8, + delete_type int8, + tenant_key varchar(10), + uuid varchar(36), + mainid varchar(36), + dataid varchar(50), + belongdataid varchar(50), + tableName varchar(200), + tablenamelabelid varchar(50), + tablenamedesc varchar(50), + fieldName varchar(200), + fieldnamelabelid varchar(200), + newValue text, + oldValue text, + newrealvalue text, + oldrealvalue text, + fieldDesc varchar(200), + showorder int8 default 0, + isdetail int8 default 0 + ) + + + create table ${detailTable} + ( + id number(*,0) not null primary key, + create_time date default sysdate, + update_time date default sysdate, + creator number(*,0), + delete_type number(*,0), + tenant_key varchar2(10), + uuid varchar2(36), + mainid varchar2(36), + dataid varchar2(50), + belongdataid varchar2(50), + tableName varchar2(200), + tablenamelabelid varchar2(50), + tablenamedesc varchar2(50), + fieldName varchar2(200), + fieldnamelabelid varchar2(200), + newValue CLOB, + oldValue CLOB, + newrealvalue CLOB, + oldrealvalue CLOB, + fieldDesc varchar2(200), + showorder number(*,0) default 0, + isdetail number(*,0) default 0 + ) + + + create table ${detailTable} + ( + id bigint not null primary key, + create_time datetime default getdate(), + update_time datetime default getdate(), + creator bigint, + delete_type bigint, + tenant_key nvarchar(10), + uuid nvarchar(36), + mainid nvarchar(36), + dataid nvarchar(50), + belongdataid nvarchar(50), + tableName nvarchar(200), + tablenamelabelid nvarchar(50), + tablenamedesc nvarchar(50), + fieldName nvarchar(200), + fieldnamelabelid nvarchar(200), + newValue nvarchar(max), + oldValue nvarchar(max), + newrealvalue nvarchar(max), + oldrealvalue nvarchar(max), + fieldDesc varchar(200), + showorder bigint default 0, + isdetail bigint default 0 + ) + + + + + + + + + + + ${createElogSql} + + + + + + + + + + + + + + + + create index idx${id} on ${tableName} (${columnName}) + + + + create index idx${id} on ${tableName} (${columnName}) + + + + create index idx${id} on ${tableName} (${columnName}) + + + + + + + + + + diff --git a/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml new file mode 100644 index 000000000..8fcc1b9c1 --- /dev/null +++ b/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml @@ -0,0 +1,170 @@ + + + + + + insert into ${tableName} (id, uuid, log_date, tenant_key, modulename, functionName, operatetypename, + log_operator, operatorname, targetid, targetname, interfacename, operatetype, + operatedesc, + params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice, + cancelcontext, device, groupid, + belongMainId, requestUrl, requestUri, totalRunTime, mainRunTime, log_result, + fromTerminal, resultDesc, old_content, + link_type, link_id, old_link_id, create_time, update_time, delete_type, creator + ${cusColumns}) + values (#{logContent.id}, #{logContent.uuid}, #{logContent.date}, + #{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName}, + #{logContent.operateTypeName}, #{logContent.logOperator}, #{logContent.operatorName}, + #{logContent.logTargetid} + , #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType}, + #{logContent.operatedesc}, + #{logContent.paramsStr}, #{logContent.clientIp}, #{logContent.groupNameLabel}, + #{logContent.redoService}, + #{logContent.redoContextStr}, #{logContent.cancelService}, #{logContent.cancelContextStr}, + #{logContent.device}, #{logContent.groupId}, + #{logContent.belongMainId}, #{logContent.requestUrl}, #{logContent.requestUri}, + #{logContent.totalRunTime}, #{logContent.mainRunTime} + , #{logContent.result}, #{logContent.fromTerminal}, #{logContent.resultDesc}, + #{logContent.old_content}, #{logContent.link_type} + , #{logContent.link_id}, #{logContent.old_link_id}, #{logContent.create_time}, + #{logContent.update_time}, #{logContent.delete_type}, #{logContent.logOperator} + ${cusValus}) + + + + insert into ${detailTableName} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key, creator, + newRealValue, oldRealValue, tableNameDesc, + tableNameLabelId, fieldNameLabelId, create_time, update_time + ${cusColumns}) + values (#{detailContext.id}, #{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, + #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, #{detailContext.tenant_key}, + #{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId}, #{detailContext.create_time}, #{detailContext.update_time} + ${cusValus}) + + + ${sql} + + + + + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) + values + + ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}) + + + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) + VALUES + ( + #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type} + ) + + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time + ${cusColumns}) + values + + ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time} + ${detailContext.cusValus}) + + + + + update ${tableName} + set delete_type = 3 + where id = #{id} + + + update ${tableName} + set delete_type = 3 + where mainid = #{mainid} + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type) + + SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type} + FROM DUAL + + + + + insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue, + fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue, + oldRealValue,tableNameDesc, + tableNameLabelId,fieldNameLabelId, create_time, update_time + ${cusColumns}) + + SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName}, + #{detailContext.fieldName}, #{detailContext.newValue}, + #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid}, + #{detailContext.belongDataid}, #{detailContext.isDetail}, + #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue} + , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId}, + #{detailContext.fieldNameLabelId} + , #{detailContext.create_time}, #{detailContext.update_time} + ${detailContext.cusValus} + FROM DUAL + + + + diff --git a/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml new file mode 100644 index 000000000..2c1f0f427 --- /dev/null +++ b/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml new file mode 100644 index 000000000..b88e3cfee --- /dev/null +++ b/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/resource/WEB-INF/lib/hrmelog.jar b/resource/WEB-INF/lib/hrmelog.jar index 633076bbe823c6ae78a32d6a86baf91b7fc2aa97..b2657be84b5fd6599033c08517e9dde8da030173 100644 GIT binary patch literal 137248 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

Eh#6>7nM*am4A0?bNL#R;VbM^ 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 L9q$E{WncgRc5)#K From e22e178d0841b6603ba8085693dfa1d7d6fbf522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 12 Mar 2024 14:51:28 +0800 Subject: [PATCH 152/169] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=9D=9E=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{WEB-INF/prop => wiki/扩展功能}/hrmSalaryBillToken.properties | 0 .../{WEB-INF/prop => wiki/扩展功能}/hrmSalaryCustom.properties | 0 .../{WEB-INF/prop => wiki/扩展功能}/hrmSalaryPayroll.properties | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename resource/{WEB-INF/prop => wiki/扩展功能}/hrmSalaryBillToken.properties (100%) rename resource/{WEB-INF/prop => wiki/扩展功能}/hrmSalaryCustom.properties (100%) rename resource/{WEB-INF/prop => wiki/扩展功能}/hrmSalaryPayroll.properties (100%) diff --git a/resource/WEB-INF/prop/hrmSalaryBillToken.properties b/resource/wiki/扩展功能/hrmSalaryBillToken.properties similarity index 100% rename from resource/WEB-INF/prop/hrmSalaryBillToken.properties rename to resource/wiki/扩展功能/hrmSalaryBillToken.properties diff --git a/resource/WEB-INF/prop/hrmSalaryCustom.properties b/resource/wiki/扩展功能/hrmSalaryCustom.properties similarity index 100% rename from resource/WEB-INF/prop/hrmSalaryCustom.properties rename to resource/wiki/扩展功能/hrmSalaryCustom.properties diff --git a/resource/WEB-INF/prop/hrmSalaryPayroll.properties b/resource/wiki/扩展功能/hrmSalaryPayroll.properties similarity index 100% rename from resource/WEB-INF/prop/hrmSalaryPayroll.properties rename to resource/wiki/扩展功能/hrmSalaryPayroll.properties From 43c57cb10b624fbcba7e14ea877b8055ed4d08a9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Tue, 12 Mar 2024 16:17:24 +0800 Subject: [PATCH 153/169] =?UTF-8?q?=E9=98=85=E5=90=8E=E5=8D=B3=E7=84=9A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/salarybill/SalarySendInfoMapper.xml | 4 ++++ .../service/impl/SalarySendServiceImpl.java | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index 477c0addb..a7738491f 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -617,6 +617,7 @@ hrsa_salary_send_info + first_reading_time = null, send_status = #{po.sendStatus}, @@ -795,6 +796,9 @@ bill_confirm_status=#{billConfirmStatus}, + + first_reading_time=#{firstReadingTime}, + WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index f544e8ff2..5a66005d6 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -507,16 +507,16 @@ public class SalarySendServiceImpl extends Service implements SalarySendService salarySendInfo.setFirstReadingTime(firstReadingTime); getSalarySendInfoMapper().updateIgnoreNull(salarySendInfo); } else { + // 不是首次查看 firstReadingTime = salarySendInfo.getFirstReadingTime(); - } - - // 获取首次查看后多少分钟不能查看工资单（0代表一旦查看后无法再次查看，null代表不限制） - Integer burningAfterReadingMin = getSalaryBillBaseSetService(user).getBurningAfterReadingMin(); - if (burningAfterReadingMin != null) { - LocalDateTime limitTime = SalaryDateUtil.dateToLocalDateTime(firstReadingTime).plusMinutes(burningAfterReadingMin); - LocalDateTime now = SalaryDateUtil.dateToLocalDateTime(new Date()); - if (limitTime.isAfter(now)) { - throw new SalaryRunTimeException("首次查看工资单" + burningAfterReadingMin + "分钟后，无法查看工资单"); + // 获取首次查看后多少分钟不能查看工资单（0代表一旦查看后无法再次查看，null代表不限制） + Integer burningAfterReadingMin = getSalaryBillBaseSetService(user).getBurningAfterReadingMin(); + if (burningAfterReadingMin != null) { + LocalDateTime limitTime = SalaryDateUtil.dateToLocalDateTime(firstReadingTime).plusMinutes(burningAfterReadingMin); + LocalDateTime now = SalaryDateUtil.dateToLocalDateTime(new Date()); + if (limitTime.isBefore(now)) { + throw new SalaryRunTimeException("首次查看工资单" + burningAfterReadingMin + "分钟后，无法查看工资单。首次查看时间为：" + SalaryDateUtil.getFormatLocalDateTime(firstReadingTime)); + } } } From bef1835c39ae812c7416f37cb30e32df5c61629d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 12 Mar 2024 16:46:55 +0800 Subject: [PATCH 154/169] =?UTF-8?q?jar=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/lib/hrmelog.jar | Bin 137248 -> 137248 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resource/WEB-INF/lib/hrmelog.jar b/resource/WEB-INF/lib/hrmelog.jar index b2657be84b5fd6599033c08517e9dde8da030173..b1ce56c1141707d25dab68afa9161f218a35d92c 100644 GIT binary patch delta 20371 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 delta 20371 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 lpa&e+l;Puf8NUCs47Uz<*}MP% From 26a3199b1ef3106c97d1111db4ad96f8360b3d80 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 13 Mar 2024 17:58:24 +0800 Subject: [PATCH 155/169] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=8A=A0=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siaccount/ExcelInsuranceDetailMapper.java | 4 + .../siaccount/ExcelInsuranceDetailMapper.xml | 189 ++++++++++++++++++ .../impl/SalarySysConfServiceImpl.java | 43 +++- 3 files changed, 232 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.java b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.java index 105c0f636..1129a814f 100644 --- a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.java +++ b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.java @@ -36,4 +36,8 @@ public interface ExcelInsuranceDetailMapper { * 批量保存 */ void batchSave(@Param("accounts") Collection accounts); + + List listAll(); + + void updateBatchSelective(@Param("list")List excelInsuranceDetailPOS); } diff --git a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml index 15ac635ce..6372d29dd 100644 --- a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml @@ -69,10 +69,13 @@ , t.other_pay_org , t.social_scheme_id , t.social_payment_base_string + , t.social_payment_com_base_string , t.fund_scheme_id , t.fund_payment_base_string + , t.fund_payment_com_base_string , t.other_scheme_id , t.other_payment_base_string + , t.other_payment_com_base_string , t.social_per_json , t.social_per_sum , t.fund_per_json @@ -114,6 +117,185 @@ + + update hrsa_excel_bill_detail + + + + + + when id = #{item.id} then #{item.socialPaymentComBaseString} + + + + + + + when id = #{item.id} then #{item.fundPaymentComBaseString} + + + + + + + when id = #{item.id} then #{item.otherPaymentComBaseString} + + + + + + + when id = #{item.id} then #{item.socialPaymentBaseString} + + + + + + + when id = #{item.id} then #{item.fundPaymentBaseString} + + + + + + + when id = #{item.id} then #{item.otherPaymentBaseString} + + + + + + + when id = #{item.id} then #{item.socialPerJson} + + + + + + + when id = #{item.id} then #{item.socialPerSum} + + + + + + + when id = #{item.id} then #{item.fundPerJson} + + + + + + + when id = #{item.id} then #{item.fundPerSum} + + + + + + + when id = #{item.id} then #{item.otherPerJson} + + + + + + + when id = #{item.id} then #{item.otherPerSum} + + + + + + + when id = #{item.id} then #{item.perSum} + + + + + + + when id = #{item.id} then #{item.socialComJson} + + + + + + + when id = #{item.id} then #{item.socialComSum} + + + + + + + when id = #{item.id} then #{item.fundComJson} + + + + + + + when id = #{item.id} then #{item.fundComSum} + + + + + + + when id = #{item.id} then #{item.otherComJson} + + + + + + + when id = #{item.id} then #{item.otherComSum} + + + + + + + when id = #{item.id} then #{item.comSum} + + + + + + + when id = #{item.id} then #{item.socialSum} + + + + + + + when id = #{item.id} then #{item.fundSum} + + + + + + + when id = #{item.id} then #{item.otherSum} + + + + + + + when id = #{item.id} then #{item.total} + + + + + where id in + + #{item.id} + + + + diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index cf3c4b893..8dc814429 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -13,6 +13,7 @@ import com.engine.salary.entity.datacollection.po.SpecialAddDeductionPO; import com.engine.salary.entity.salaryacct.po.ExcelAcctResultPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO; +import com.engine.salary.entity.siaccount.po.ExcelInsuranceDetailPO; import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; @@ -28,6 +29,7 @@ import com.engine.salary.mapper.datacollection.OtherDeductionMapper; import com.engine.salary.mapper.datacollection.SpecialAddDeductionMapper; import com.engine.salary.mapper.salaryacct.ExcelAcctResultMapper; import com.engine.salary.mapper.salaryacct.SalaryAcctResultMapper; +import com.engine.salary.mapper.siaccount.ExcelInsuranceDetailMapper; import com.engine.salary.mapper.siaccount.InsuranceAccountBatchMapper; import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; import com.engine.salary.mapper.siarchives.FundSchemeMapper; @@ -45,12 +47,12 @@ import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.enums.*; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.db.MapperProxyFactory; import com.google.common.collect.Lists; import com.weaver.util.threadPool.ThreadPoolUtil; import com.weaver.util.threadPool.constant.ModulePoolEnum; import com.weaver.util.threadPool.entity.LocalRunnable; -import com.engine.salary.util.db.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -143,6 +145,10 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe return MapperProxyFactory.getProxy(SpecialAddDeductionMapper.class); } + private ExcelInsuranceDetailMapper getExcelInsuranceDetailMapper() { + return MapperProxyFactory.getProxy(ExcelInsuranceDetailMapper.class); + } + private SalarySysConfService getSalarySysConfService(User user) { return ServiceUtil.getService(SalarySysConfServiceImpl.class, user); } @@ -1107,14 +1113,43 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe } return 1; }); - int flag = submit.get() + submit1.get() + submit2.get() + submit3.get() + submit4.get() + submit5.get() + submit6.get() + submit7.get() + submit8.get() + submit9.get() + submit10.get() + submit11.get() + submit12.get() + submit13.get(); - if (flag == 14) { + + Future submit14 = fixedThreadPool.submit(() -> { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + List excelInsuranceDetailPOS = getExcelInsuranceDetailMapper().listAll(); + if (CollectionUtils.isNotEmpty(excelInsuranceDetailPOS)) { + excelInsuranceDetailPOS.forEach(po -> { + if (OpenEnum.OFF.getValue().equals(isOpenEncrypt)) { + encryptUtil.decrypt(po, ExcelInsuranceDetailPO.class); + } else { + encryptUtil.encrypt(po, ExcelInsuranceDetailPO.class); + } + }); + List> partition = Lists.partition(excelInsuranceDetailPOS, 50); + ExcelInsuranceDetailMapper mapper = sqlSession.getMapper(ExcelInsuranceDetailMapper.class); + partition.forEach(mapper::updateBatchSelective); + sqlSession.commit(); + log.info("finish hrsa_excel_bill_detail"); + } + } catch (Exception e) { + sqlSession.rollback(); + log.error("fail hrsa_excel_bill_detail", e); + return 0; + } finally { + sqlSession.close(); + } + return 1; + }); + + int flag = submit.get() + submit1.get() + submit2.get() + submit3.get() + submit4.get() + submit5.get() + submit6.get() + submit7.get() + submit8.get() + submit9.get() + submit10.get() + submit11.get() + submit12.get() + submit13.get() + submit14.get(); + if (flag == 15) { Util_DataCache.setObjVal(ENCRYPT_IN_PROGRESS + progressId, "success", 30); } else { Util_DataCache.setObjVal(ENCRYPT_IN_PROGRESS + progressId, "fail", 30); } Util_DataCache.clearVal(AES_ENCRYPT_IN_PROGRESS); - return flag == 14; + return flag == 15; } catch (Exception e) { Util_DataCache.setObjVal(ENCRYPT_IN_PROGRESS + progressId, "fail", 30); Util_DataCache.clearVal(AES_ENCRYPT_IN_PROGRESS); From f23b23cd923790e3591c1d47959d6d5b691ca22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 14 Mar 2024 10:25:39 +0800 Subject: [PATCH 156/169] =?UTF-8?q?=E4=BC=98=E5=8C=96IF=E8=A7=A3=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/constant/des.json | 2 +- src/com/engine/salary/formlua/constant/FormluaConstant.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/constant/des.json b/src/com/engine/salary/constant/des.json index fe3b8ce5f..f82a626bd 100644 --- a/src/com/engine/salary/constant/des.json +++ b/src/com/engine/salary/constant/des.json @@ -993,7 +993,7 @@ "name": "IF", "chineseName": "如果条件为真，则...否则...", "description": "如果条件为真，则执行表达式1，为假则执行表达式2。条件中不可嵌套使用IF函数。", - "example": "IF({员工表.年龄} > 60, '退休', '在职')
IF({员工表.年龄} > 60, IF({员工表.性别} = {员工表.性别.女}, '退休', '在职'), '在职')", + "example": "IF({员工表.年龄} > 60, '退休', '在职') ", "result": "'退休'
'在职'", "paramDescs": [ "*条件*（必选）", diff --git a/src/com/engine/salary/formlua/constant/FormluaConstant.java b/src/com/engine/salary/formlua/constant/FormluaConstant.java index df616310e..4cce5e978 100644 --- a/src/com/engine/salary/formlua/constant/FormluaConstant.java +++ b/src/com/engine/salary/formlua/constant/FormluaConstant.java @@ -998,7 +998,7 @@ public class FormluaConstant { " \"name\": \"IF\",\n" + " \"chineseName\": \"如果条件为真，则...否则...\",\n" + " \"description\": \"如果条件为真，则执行表达式1，为假则执行表达式2。条件中不可嵌套使用IF函数。\",\n" + - " \"example\": \"IF({员工表.年龄} > 60, '退休', '在职')
IF({员工表.年龄} > 60, IF({员工表.性别} = {员工表.性别.女}, '退休', '在职'), '在职')\",\n" + + " \"example\": \"IF({员工表.年龄} > 60, '退休', '在职') \",\n" + " \"result\": \"'退休'
'在职'\",\n" + " \"paramDescs\": [\n" + " \"*条件*（必选）\",\n" + From 8543d70a6654fe507fab0aa0f8870f1b524ab20f Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 14 Mar 2024 11:07:01 +0800 Subject: [PATCH 157/169] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=8A=A0=E8=A7=A3?= =?UTF-8?q?=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siaccount/ExcelInsuranceDetailMapper.xml | 50 ++++++++++++++++++- .../InsuranceAccountDetailMapper.xml | 23 +++++++++ .../mapper/siarchives/FundSchemeMapper.xml | 7 +++ .../mapper/siarchives/OtherSchemeMapper.xml | 7 +++ .../mapper/siarchives/SocialSchemeMapper.xml | 7 +++ .../impl/SalarySysConfServiceImpl.java | 44 ++++++++++++++-- 6 files changed, 134 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml index 6372d29dd..53c1265b1 100644 --- a/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/ExcelInsuranceDetailMapper.xml @@ -313,7 +313,55 @@ + + UPDATE hrsa_salary_archive diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java index 80e9c5e2e..898d55471 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java @@ -127,4 +127,11 @@ public interface InsuranceBaseInfoMapper { * @return */ List listEndDateIsNull(@Param("employeeIds") List employeeIds); + + /** + * 获取没有设置社保、公积金最后缴纳月的档案 + * @param employeeIds + * @return + */ + List listStartDateIsNull(@Param("employeeIds") List employeeIds); } diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml index 467dbf9f2..33ceb8af1 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml @@ -301,6 +301,38 @@ + + + UPDATE hrsa_insurance_base_info diff --git a/src/com/engine/salary/service/SIArchivesService.java b/src/com/engine/salary/service/SIArchivesService.java index 4f98cc742..877355676 100644 --- a/src/com/engine/salary/service/SIArchivesService.java +++ b/src/com/engine/salary/service/SIArchivesService.java @@ -7,11 +7,11 @@ import com.engine.salary.entity.siarchives.param.InsuranceArchivesSaveParam; import com.engine.salary.entity.siarchives.param.SIArchiveBaseHistoryListParam; import com.engine.salary.entity.siarchives.po.*; import com.engine.salary.util.page.PageInfo; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Author weaver_cl @@ -152,4 +152,12 @@ public interface SIArchivesService { void batchInsertAdjustHistory(List adjustHistoryList); List listEndDateIsNull(List employeeIds); + + List listStartDateIsNull(List employeeIds); + + List listInsuranceArchivesSocialSchemeByIds(List ids); + + List listInsuranceArchivesFundSchemeByIds(List ids); + + List listInsuranceArchivesOtherSchemeByIds(List ids); } diff --git a/src/com/engine/salary/service/SalaryArchiveService.java b/src/com/engine/salary/service/SalaryArchiveService.java index 60a059bae..5ab2dac29 100644 --- a/src/com/engine/salary/service/SalaryArchiveService.java +++ b/src/com/engine/salary/service/SalaryArchiveService.java @@ -250,4 +250,10 @@ public interface SalaryArchiveService { */ String syncPayStartDate(); + /** + * 根据列表状态获取起始发薪日期为空的薪资档案 + * @param runStatus + * @return + */ + List listPayStartDateIsNull(String runStatus); } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 9dd1e070f..811127514 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -3954,5 +3954,48 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } return getInsuranceBaseInfoMapper().listEndDateIsNull(employeeIds); } + + /** + * 获取没有设置社保、公积金最后缴纳月的档案 + * @param employeeIds + * @return + */ + @Override + public List listStartDateIsNull(List employeeIds) { + return getInsuranceBaseInfoMapper().listStartDateIsNull(employeeIds); + } /*****以上代码为SIArchivesBiz中方法逻辑迁移，旨在减少Biz类的使用*****/ + + @Override + public List listInsuranceArchivesSocialSchemeByIds(List ids) { + if (CollectionUtils.isEmpty(ids)) { + return Collections.emptyList(); + } + List> partition = Lists.partition(ids, 1000); + ArrayList resultList = new ArrayList<>(); + partition.forEach(list -> resultList.addAll(getSocialSchemeMapper().getSocialById(list))); + return resultList; + } + + @Override + public List listInsuranceArchivesFundSchemeByIds(List ids) { + if (CollectionUtils.isEmpty(ids)) { + return Collections.emptyList(); + } + List> partition = Lists.partition(ids, 1000); + ArrayList resultList = new ArrayList<>(); + partition.forEach(list -> resultList.addAll(getFundSchemeMapper().getFundById(list))); + return resultList; + } + + @Override + public List listInsuranceArchivesOtherSchemeByIds(List ids) { + if (CollectionUtils.isEmpty(ids)) { + return Collections.emptyList(); + } + List> partition = Lists.partition(ids, 1000); + ArrayList resultList = new ArrayList<>(); + partition.forEach(list -> resultList.addAll(getOtherSchemeMapper().getOtherById(list))); + return resultList; + } } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index b5958e8bf..e492cbd16 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -1419,4 +1419,12 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe salaryArchiveMapper.batchUpdate(archives); return "执行完毕"; } + + @Override + public List listPayStartDateIsNull(String runStatus) { + if (StringUtils.isBlank(runStatus)) { + return Collections.emptyList(); + } + return getSalaryArchiveMapper().listPayStartDateIsNull(runStatus); + } } diff --git a/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java b/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java new file mode 100644 index 000000000..1b4c32c84 --- /dev/null +++ b/src/com/engine/salary/timer/AutoSyncEmpArchiveStartDateJob.java @@ -0,0 +1,159 @@ +package com.engine.salary.timer; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.biz.SalaryArchiveBiz; +import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; +import com.engine.salary.enums.salaryarchive.SalaryArchiveListTypeEnum; +import com.engine.salary.enums.siaccount.EmployeeStatusEnum; +import com.engine.salary.mapper.siarchives.FundSchemeMapper; +import com.engine.salary.mapper.siarchives.OtherSchemeMapper; +import com.engine.salary.mapper.siarchives.SocialSchemeMapper; +import com.engine.salary.service.SIArchivesService; +import com.engine.salary.service.SalaryArchiveService; +import com.engine.salary.service.SalaryEmployeeService; +import com.engine.salary.service.impl.SIArchivesServiceImpl; +import com.engine.salary.service.impl.SalaryArchiveServiceImpl; +import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; +import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; +import weaver.hrm.User; +import weaver.interfaces.schedule.BaseCronJob; + +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author Harryxzy + * @ClassName AutoSyncInsuranceArchiveJob + * @date 2023/08/14 9:30 + * @description 自动同步人员社保福利档案、薪资档案为公司开始日期字段（companystartdate） + */ +public class AutoSyncEmpArchiveStartDateJob extends BaseCronJob { + + private SalaryArchiveService getSalaryArchiveService(User user) { + return ServiceUtil.getService(SalaryArchiveServiceImpl.class,user); + } + + private SalaryEmployeeService getSalaryEmployeeService(User user) { + return ServiceUtil.getService(SalaryEmployeeServiceImpl.class,user); + } + + + private SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class,user); + } + + private String syncInsuranceArchive; + + private String syncSalaryArchive; + + private SalaryArchiveBiz getSalaryArchiveMapper = new SalaryArchiveBiz(); + + private SocialSchemeMapper getSocialSchemeMapper() { + return MapperProxyFactory.getProxy(SocialSchemeMapper.class); + } + + private FundSchemeMapper getFundSchemeMapper() { + return MapperProxyFactory.getProxy(FundSchemeMapper.class); + } + + private OtherSchemeMapper getOtherSchemeMapper() { + return MapperProxyFactory.getProxy(OtherSchemeMapper.class); + } + + + + @Override + public void execute() { + User user = new User(); + user.setUid(1); + user.setLoginid("sysadmin"); + + if (StringUtils.isBlank(syncInsuranceArchive) || !StringUtils.equals(syncInsuranceArchive,"false")) { + // 同步社保福利档案 + // 获取社保、公积金、其他福利中起始缴纳月任意一个为空的社保档案主表po + List needSyncInsuranceBaseInfoList = getSIArchivesService(user).listStartDateIsNull(Collections.emptyList()); + // 过滤出档案状态为待增员的 + needSyncInsuranceBaseInfoList = needSyncInsuranceBaseInfoList.stream().filter(po -> po.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())).collect(Collectors.toList()); + // 获取同步人员的公司开始日期 + List employeeList = getSalaryEmployeeService(user).listByIds(SalaryEntityUtil.properties(needSyncInsuranceBaseInfoList, InsuranceArchivesBaseInfoPO::getEmployeeId, Collectors.toList())); + Map empInfoMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId, emp -> { + if (StringUtils.isBlank(emp.getCompanystartdate()) || !SalaryDateUtil.checkDay(emp.getCompanystartdate())) { + return ""; + } else { + return StringUtils.substring(emp.getCompanystartdate(), 0, 7); + } + }); + // 设置社保起始缴纳月信息 + List needSyncSocialArchiveIds = SalaryEntityUtil.properties(needSyncInsuranceBaseInfoList, InsuranceArchivesBaseInfoPO::getSocialArchivesId, Collectors.toList()); + List insuranceArchivesSocialSchemePOS = getSIArchivesService(user).listInsuranceArchivesSocialSchemeByIds(needSyncSocialArchiveIds); + insuranceArchivesSocialSchemePOS.stream().forEach(po -> { + if (StringUtils.isBlank(po.getSocialStartTime()) && StringUtils.isNotBlank(empInfoMap.get(po.getEmployeeId()))) { + po.setSocialStartTime(empInfoMap.get(po.getEmployeeId())); + getSocialSchemeMapper().updateById(po); + } + }); + + // 设置公积金起始缴纳月信息 + List needSyncFundArchiveIds = SalaryEntityUtil.properties(needSyncInsuranceBaseInfoList, InsuranceArchivesBaseInfoPO::getFundArchivesId, Collectors.toList()); + List insuranceArchivesFundSchemePOS = getSIArchivesService(user).listInsuranceArchivesFundSchemeByIds(needSyncFundArchiveIds); + insuranceArchivesFundSchemePOS.stream().forEach(po -> { + if (StringUtils.isBlank(po.getFundStartTime()) && StringUtils.isNotBlank(empInfoMap.get(po.getEmployeeId()))) { + po.setFundStartTime(empInfoMap.get(po.getEmployeeId())); + getFundSchemeMapper().updateById(po); + } + }); + + // 设置其他福利起始缴纳月信息 + List needSyncOtherArchiveIds = SalaryEntityUtil.properties(needSyncInsuranceBaseInfoList, InsuranceArchivesBaseInfoPO::getOtherArchivesId, Collectors.toList()); + List insuranceArchivesOtherSchemePOS = getSIArchivesService(user).listInsuranceArchivesOtherSchemeByIds(needSyncOtherArchiveIds); + insuranceArchivesOtherSchemePOS.stream().forEach(po -> { + if (StringUtils.isBlank(po.getOtherStartTime()) && StringUtils.isNotBlank(empInfoMap.get(po.getEmployeeId()))) { + po.setOtherStartTime(empInfoMap.get(po.getEmployeeId())); + getOtherSchemeMapper().updateById(po); + } + }); + } + + if (StringUtils.isBlank(syncSalaryArchive) || !StringUtils.equals(syncSalaryArchive,"false")) { + // 同步薪资档案 + // 获取薪资档案起始发薪日为空且是待定薪资的档案 + List salaryArchiveList = getSalaryArchiveService(user).listPayStartDateIsNull(SalaryArchiveListTypeEnum.PENDING.getValue()); + List empIds = SalaryEntityUtil.properties(salaryArchiveList, SalaryArchivePO::getEmployeeId, Collectors.toList()); + List employeeList = getSalaryEmployeeService(user).listByIds(empIds); + Map empMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId, emp -> { + if (StringUtils.isBlank(emp.getCompanystartdate()) || !SalaryDateUtil.checkDay(emp.getCompanystartdate())) { + return null; + } else { + return SalaryDateUtil.stringToDate(StringUtils.substring(emp.getCompanystartdate(), 0, 10)); + } + }); + List needUpdateArchiveList = salaryArchiveList.stream().filter(archive -> { + if (archive.getPayStartDate() == null) { + Date startDate = empMap.get(archive.getEmployeeId()); + if (startDate != null) { + archive.setPayStartDate(startDate); + return true; + } else { + return false; + } + } else { + return false; + } + }).collect(Collectors.toList()); + getSalaryArchiveMapper.batchUpdate(needUpdateArchiveList); + } + + } + +} From 417c9f703d500bd958f0314a074f4f239a0ec2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 14 Mar 2024 15:28:14 +0800 Subject: [PATCH 160/169] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=97=B6=E5=B8=A6=E5=87=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/biz/AddUpSituationBiz.java | 18 +- .../salary/biz/SpecialAddDeductionBiz.java | 3 +- .../dto/AddUpDeductionRecordDTO.java | 7 +- .../datacollection/dto/AddUpSituationDTO.java | 2 + .../dto/OtherDeductionListDTO.java | 2 + .../dto/SpecialAddDeductionListDTO.java | 2 + .../param/AddUpDeductionQueryParam.java | 3 + .../param/AddUpSituationQueryParam.java | 3 + .../param/OtherDeductionQueryParam.java | 4 + .../param/SpecialAddDeductionQueryParam.java | 3 + .../salary/service/AddUpDeductionService.java | 3 +- .../impl/AddUpDeductionServiceImpl.java | 121 ++++------- .../impl/AddUpSituationServiceImpl.java | 193 ++++++------------ .../impl/OtherDeductionServiceImpl.java | 133 ++++++------ .../impl/SpecialAddDeductionServiceImpl.java | 14 +- .../salary/web/AddUpDeductionController.java | 4 + .../salary/web/AddUpSituationController.java | 4 + .../salary/web/OtherDeductionController.java | 5 + .../web/SpecialAddDeductionController.java | 11 +- .../salary/wrapper/AddUpDeductionWrapper.java | 3 +- .../salary/wrapper/OtherDeductionWrapper.java | 2 +- 21 files changed, 213 insertions(+), 327 deletions(-) diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java index b3d47b935..68515ff23 100644 --- a/src/com/engine/salary/biz/AddUpSituationBiz.java +++ b/src/com/engine/salary/biz/AddUpSituationBiz.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpSituationDTO; import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO; import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam; import com.engine.salary.mapper.datacollection.AddUpSituationMapper; +import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; @@ -30,7 +31,8 @@ public class AddUpSituationBiz extends BaseBean { try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); List list = mapper.list(param); - return encryptUtil.decryptList(list, AddUpSituationDTO.class); + encryptUtil.decryptList(list, AddUpSituationDTO.class); + return SalaryI18nUtil.i18nList(list); } finally { sqlSession.close(); } @@ -46,15 +48,15 @@ public class AddUpSituationBiz extends BaseBean { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); - if(CollectionUtils.isNotEmpty(param.getEmployeeIds())){ + if (CollectionUtils.isNotEmpty(param.getEmployeeIds())) { List addUpSituations = new ArrayList<>(); List> partition = Lists.partition((List) param.getEmployeeIds(), 500); - partition.forEach(l->{ + partition.forEach(l -> { param.setEmployeeIds(l); addUpSituations.addAll(mapper.listSome(param)); }); - return encryptUtil.decryptList(addUpSituations, AddUpSituation.class); - }else { + return encryptUtil.decryptList(addUpSituations, AddUpSituation.class); + } else { List addUpSituations = mapper.listSome(param); return encryptUtil.decryptList(addUpSituations, AddUpSituation.class); } @@ -143,9 +145,6 @@ public class AddUpSituationBiz extends BaseBean { } - - - public void handleImportData(List pos) { if (CollectionUtils.isEmpty(pos)) { return; @@ -188,10 +187,9 @@ public class AddUpSituationBiz extends BaseBean { } - /** - * @description 批量删除数据 * @return void + * @description 批量删除数据 * @author Harryxzy * @date 2022/10/27 22:39 */ diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java index a2203e89f..be57b5c29 100644 --- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java +++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java @@ -51,7 +51,8 @@ public class SpecialAddDeductionBiz extends BaseBean { public List listByParam(SpecialAddDeductionQueryParam param) { List specialAddDeductionListDTOS = mapper().listByParam(param); - return encryptUtil.decryptList(specialAddDeductionListDTOS, SpecialAddDeductionListDTO.class); + encryptUtil.decryptList(specialAddDeductionListDTOS, SpecialAddDeductionListDTO.class); + return SalaryI18nUtil.i18nList(specialAddDeductionListDTOS); } public List listByTaxAgentIds(List taxAgentIds) { diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java index b3cbbc0d7..4de554f12 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionRecordDTO.java @@ -1,10 +1,7 @@ package com.engine.salary.entity.datacollection.dto; import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.salary.annotation.Encrypt; -import com.engine.salary.annotation.SalaryTable; -import com.engine.salary.annotation.SalaryTableColumn; -import com.engine.salary.annotation.TableTitle; +import com.engine.salary.annotation.*; import com.engine.salary.util.excel.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; @@ -31,6 +28,7 @@ public class AddUpDeductionRecordDTO { private Long employeeId; @ExcelProperty(index = 0) + @I18n private String username; //申报月份 @@ -56,6 +54,7 @@ public class AddUpDeductionRecordDTO { @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @ExcelProperty(index = 3) + @I18n private String departmentName; //手机号 diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java index fd217469e..bd4a80aaa 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java @@ -39,6 +39,7 @@ public class AddUpSituationDTO { @SalaryTableColumn(text = "姓名", width = "10%", column = "username") @TableTitle(title = "姓名", dataIndex = "username", key = "username") @ExcelProperty(index = 0) + @I18n private String username; // // @SalaryTableColumn(text = "申报月份", width = "10%", column = "username") @@ -59,6 +60,7 @@ public class AddUpSituationDTO { @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @ExcelProperty(index = 2) + @I18n private String departmentName; //手机号 diff --git a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java index 5ea78ea2f..94f3580d0 100644 --- a/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/OtherDeductionListDTO.java @@ -37,6 +37,7 @@ public class OtherDeductionListDTO { @SalaryTableColumn(text = "姓名", width = "10%", column = "username") @TableTitle(title = "姓名", dataIndex = "username", key = "username") @ExcelProperty(index = 0) + @I18n private String username; //个税扣缴义务人 @@ -54,6 +55,7 @@ public class OtherDeductionListDTO { @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @ExcelProperty(index = 2) + @I18n private String departmentName; //手机号 diff --git a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java index 8597f505b..5e480bb21 100644 --- a/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/SpecialAddDeductionListDTO.java @@ -37,6 +37,7 @@ public class SpecialAddDeductionListDTO { @SalaryTableColumn(text = "姓名", width = "10%", column = "username") @TableTitle(title = "姓名", dataIndex = "username", key = "username") @ExcelProperty(index = 0) + @I18n private String username; //个税扣缴义务人 @@ -54,6 +55,7 @@ public class SpecialAddDeductionListDTO { @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") @ExcelProperty(index = 2) + @I18n private String departmentName; //手机号 diff --git a/src/com/engine/salary/entity/datacollection/param/AddUpDeductionQueryParam.java b/src/com/engine/salary/entity/datacollection/param/AddUpDeductionQueryParam.java index bd23b85fa..15cf175d7 100644 --- a/src/com/engine/salary/entity/datacollection/param/AddUpDeductionQueryParam.java +++ b/src/com/engine/salary/entity/datacollection/param/AddUpDeductionQueryParam.java @@ -67,4 +67,7 @@ public class AddUpDeductionQueryParam extends BaseQueryParam { //累计专项附加扣除id（获取明细） private Long accumulatedSpecialAdditionalDeductionId; + + //下载模板时是否带出现有数据 + private boolean hasData; } diff --git a/src/com/engine/salary/entity/datacollection/param/AddUpSituationQueryParam.java b/src/com/engine/salary/entity/datacollection/param/AddUpSituationQueryParam.java index c8fbd1ef6..70998028f 100644 --- a/src/com/engine/salary/entity/datacollection/param/AddUpSituationQueryParam.java +++ b/src/com/engine/salary/entity/datacollection/param/AddUpSituationQueryParam.java @@ -62,4 +62,7 @@ public class AddUpSituationQueryParam extends BaseQueryParam { //累计情况id（获取明细） private Long accumulatedSituationId; + + //下载模板时是否带出现有数据 + private boolean hasData; } diff --git a/src/com/engine/salary/entity/datacollection/param/OtherDeductionQueryParam.java b/src/com/engine/salary/entity/datacollection/param/OtherDeductionQueryParam.java index d406380ed..d3683d46b 100644 --- a/src/com/engine/salary/entity/datacollection/param/OtherDeductionQueryParam.java +++ b/src/com/engine/salary/entity/datacollection/param/OtherDeductionQueryParam.java @@ -58,4 +58,8 @@ public class OtherDeductionQueryParam extends BaseQueryParam { //其他免税扣除id（获取明细） private Long otherTaxExemptDeductionId; + + + //下载模板是否带数据 + private boolean hasData; } diff --git a/src/com/engine/salary/entity/datacollection/param/SpecialAddDeductionQueryParam.java b/src/com/engine/salary/entity/datacollection/param/SpecialAddDeductionQueryParam.java index a9e887bb7..26c478a8c 100644 --- a/src/com/engine/salary/entity/datacollection/param/SpecialAddDeductionQueryParam.java +++ b/src/com/engine/salary/entity/datacollection/param/SpecialAddDeductionQueryParam.java @@ -54,4 +54,7 @@ public class SpecialAddDeductionQueryParam extends BaseQueryParam { //其他免税扣除id（获取明细） private Long specialAddDeductionId; + + //下载模板是否带数据 + private boolean hasData; } diff --git a/src/com/engine/salary/service/AddUpDeductionService.java b/src/com/engine/salary/service/AddUpDeductionService.java index 51498f653..29d3d58a9 100644 --- a/src/com/engine/salary/service/AddUpDeductionService.java +++ b/src/com/engine/salary/service/AddUpDeductionService.java @@ -78,10 +78,9 @@ public interface AddUpDeductionService { /** * 导出 * - * @param isChief * @param queryParam */ - XSSFWorkbook export(boolean isChief, AddUpDeductionQueryParam queryParam); + XSSFWorkbook export( AddUpDeductionQueryParam queryParam); /** * 导出详情 diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 1026aaee5..5817e89de 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -234,7 +234,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction String workcode = dto.getJobNum(); //筛选导入人员信息可以在人力资源池中匹配到的人员信息 - List employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null); + List employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null); if (StringUtils.isBlank(userName) && "0".equals(confValue)) { //姓名 不能为空 @@ -422,7 +422,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction String formatYearMonth = SalaryDateUtil.getFormatYearMonth(po.getDeclareMonth()); LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "累计专项附加扣除 ") + formatYearMonth); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除 ") + formatYearMonth); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导入累计专项附加扣除 ") + formatYearMonth); @@ -445,7 +445,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction throw new SalaryRunTimeException("该数据不存在！"); } Long taxAgentId = byId.getTaxAgentId(); - boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId() , taxAgentId)); + boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId(), taxAgentId)); if (!canEdit) { //没有编辑权限 throw new SalaryRunTimeException("该个税扣缴义务人无权限编辑此数据！"); @@ -490,7 +490,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //税款所属期 String declareMonthStr = addUpDeductionRecordParam.getDeclareMonth(); - if (declareMonthStr .equals("")) { + if (declareMonthStr.equals("")) { throw new SalaryRunTimeException("税款所属期不能为空！"); } // 获取所有个税扣缴义务人 @@ -518,7 +518,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction .updateTime(now) .creator((long) user.getUID()) .declareMonth(declareMonth).build(); - boolean employeeSameId = employees.stream().anyMatch(e -> Objects.equals(e.getEmployeeId() , addUpDeductionRecordParam.getEmployeeId())); + boolean employeeSameId = employees.stream().anyMatch(e -> Objects.equals(e.getEmployeeId(), addUpDeductionRecordParam.getEmployeeId())); if (!employeeSameId) { throw new SalaryRunTimeException("员工信息不存在"); } @@ -617,7 +617,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction throw new SalaryRunTimeException("数据不存在或已被删除！"); } // 判断是否在个税扣缴义务人范围内 - Optional first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId() , byId.getTaxAgentId())).findFirst(); + Optional first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId(), byId.getTaxAgentId())).findFirst(); if (!first.isPresent()) { throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); } @@ -635,7 +635,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //记录日志 if (CollectionUtils.isNotEmpty(oldAddUpDeductions)) { - oldAddUpDeductions.stream().forEach( e -> { + oldAddUpDeductions.stream().forEach(e -> { LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setTargetId(e.getId().toString()); loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + e.getId()); @@ -669,7 +669,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction if (deleteParam.getTaxAgentId() != null && (!deleteParam.getTaxAgentId().equals(""))) { // 设置了个税扣缴义务人 Long taxAgentId = SalaryEntityUtil.string2Long(deleteParam.getTaxAgentId()); - boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t , taxAgentId)); + boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t, taxAgentId)); if (!canDelete) { throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内!"); } @@ -732,12 +732,12 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction @Override public String autoAddAll(Date yearMonth, Boolean isAdmin) { String cacheKey = "addUpDeduction_autoAddAll_processing"; - Object objVal = Util_DataCache.getObjVal( cacheKey); - if(objVal != null){ + Object objVal = Util_DataCache.getObjVal(cacheKey); + if (objVal != null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(135788, "一键累计过于频繁，请稍后再试")); } try { - Util_DataCache.setObjVal(cacheKey,true ); + Util_DataCache.setObjVal(cacheKey, true); //如果是定时任务直接查询所有，isAdmin传true boolean isChief = Boolean.TRUE.equals(isAdmin) || getTaxAgentService(user).isChief((long) user.getUID()); @@ -844,10 +844,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction String yearMonthStr = SalaryDateUtil.getFormatYearMonth(yearMonth); LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "一键累计 "+yearMonthStr)); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "一键累计 " + yearMonthStr)); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "一键累计专项附加扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "一键累计 "+ yearMonthStr +" 专项附加扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "一键累计 " + yearMonthStr + " 专项附加扣除")); loggerContext.setNewValueList(updateList); SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); } @@ -1138,24 +1138,16 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction SalaryI18nUtil.getI18nLabel(105142, "累计婴幼儿照护") }; - List dataIndexList = Lists.newArrayList("username", "taxAgentName", "departmentName", "mobile", "workcode", "idNo", "hiredate", "billMonth", "supplementaryMonth"); List headerList = Arrays.asList(header); //查询当前申报月份和个税扣缴义务人的累计专项附加扣除表数据 - List> resultMapList = getAddUpDeductionDate(queryParam); - // excel导出的数据 - List> rows = Lists.newArrayListWithExpectedSize(resultMapList.size()); - + List> rows = new ArrayList<>(); rows.add(headerList); - for (Map map : resultMapList) { - List row = Lists.newArrayListWithExpectedSize(headerList.size()); - for (String dataIndex : dataIndexList) { - row.add(map.getOrDefault(dataIndex, StringUtils.EMPTY)); - } - rows.add(row); + if (queryParam.isHasData()) { + List> datas = getLists(queryParam); + rows.addAll(datas); } - // 4.注释 List excelComments = Lists.newArrayList(); excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(100344, "必填"))); @@ -1173,46 +1165,18 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction return book; } - /** - * 查询当前申报月份和个税扣缴义务人的累计专项附加扣除表数据 - */ - private List> getAddUpDeductionDate(AddUpDeductionQueryParam queryParam) { - - List> resultList = new ArrayList<>(); - - //申报月份 - List declareMonth = queryParam.getDeclareMonth(); - if (CollectionUtils.isNotEmpty(declareMonth)) { - queryParam.setDeclareMonth(declareMonth.stream().map(e -> e + "-01 00:00:00").collect(Collectors.toList())); - queryParam.setDeclareMonthDate(declareMonth.stream().map(e -> e + "-01 00:00:00").map(SalaryDateUtil::dateStrToLocalTime).collect(Collectors.toList())); - } - List list = new AddUpDeductionBiz().list(queryParam); - - for (AddUpDeductionDTO dto : list) { - Map resultMap = new HashMap<>(); - resultMap.put("username", Util.null2String(dto.getUsername())); - resultMap.put("departmentName", Util.null2String(dto.getDepartmentName())); - resultMap.put("mobile", Util.null2String(dto.getMobile())); - resultMap.put("workcode", Util.null2String(dto.getJobNum())); - resultMap.put("taxAgentName", Util.null2String(dto.getTaxAgentName())); - if (dto.getIdNo() != null) { - resultMap.put("idNo", Util.null2String(dto.getIdNo())); - } - if (dto.getHiredate() != null) { - resultMap.put("hiredate", Util.null2String(dto.getHiredate())); - } - - resultList.add(resultMap); - } - return resultList; - } - @Override - public XSSFWorkbook export(boolean isChief, AddUpDeductionQueryParam queryParam) { + public XSSFWorkbook export(AddUpDeductionQueryParam queryParam) { + //excel标题 + List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护"); - //获取操作按钮资源 - List> rowList = getExcelRowList(isChief, queryParam); + List> dataRowList = getLists(queryParam); + + List> rowList = new ArrayList<>(); + rowList.add(title); + + rowList.addAll(dataRowList); // 记录日志 String name = SalaryI18nUtil.getI18nLabel(0, "导出"); @@ -1225,22 +1189,12 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); //获取excel - return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除"); + return ExcelUtil.genWorkbookV2(rowList, "累计专项附加扣除"); } + private List> getLists(AddUpDeductionQueryParam param) { - /** - * 获取excel数据行 - * - * @return 导出数据行集合 - */ - private List> getExcelRowList(boolean isChief, AddUpDeductionQueryParam param) { - Long employeeId = (long) user.getUID(); - - //excel标题 - List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护"); - - + long uid = user.getUID(); //排序配置 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); param.setOrderRule(orderRule); @@ -1248,9 +1202,9 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction List list = new AddUpDeductionBiz().list(param); // 开启分权并且不是薪酬模块总管理员 - if (getTaxAgentService(user).isOpenDevolution() && !isChief) { - List taxAgentEmployees = getTaxAgentService(user).listTaxAgentAndEmployee(employeeId); - List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); + if (getTaxAgentService(user).isNeedAuth(uid)) { + List taxAgentEmployees = getTaxAgentService(user).listTaxAgentAndEmployee(uid); + List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(uid).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); list = list.stream().filter(f -> // 作为管理员 taxAgentIdsAsAdmin.contains(f.getTaxAgentId()) @@ -1259,11 +1213,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction ).collect(Collectors.toList()); } - - final List> dataRowList = Optional.ofNullable(list) + List> dataRowList = Optional.ofNullable(list) .map(List::stream) .map(operatorStream -> operatorStream.map(dto -> { - List cellList = new ArrayList<>(); + List cellList = new ArrayList<>(); cellList.add(Util.null2String(dto.getUsername())); cellList.add(Util.null2String(dto.getTaxAgentName())); cellList.add(Util.null2String(dto.getDepartmentName())); @@ -1281,11 +1234,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction return cellList; }).collect(Collectors.toList())) .orElse(Collections.emptyList()); - - List> rowList = new ArrayList<>(); - rowList.add(title); - rowList.addAll(dataRowList); - return rowList; + return dataRowList; } diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index b147e6b7d..5f503572d 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -260,7 +260,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation @Override public XSSFWorkbook export(AddUpSituationQueryParam queryParam) { // 获取操作按钮资源 - List> rowList = getExcelRowList(queryParam); + List> rowList = getExcelRowList(queryParam, true); // 记录日志 String name = SalaryI18nUtil.getI18nLabel(0, "导出"); @@ -273,7 +273,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext); // 获取excel - return ExcelUtil.genWorkbook(rowList, "累计情况"); + return ExcelUtil.genWorkbookV2(rowList, "累计情况"); } @@ -282,62 +282,65 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation * * @return 导出数据行集合 */ - private List> getExcelRowList(AddUpSituationQueryParam param) { + private List> getExcelRowList(AddUpSituationQueryParam param, boolean hasData) { long employeeId = user.getUID(); // excel标题 - final List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用", + final List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计收入额", "累计减除费用", "累计社保个人合计", "累计公积金个人合计", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计企业（职业）年金及其他福利", "累计其他扣除", "累计免税收入", "累计准予扣除的捐赠额", "累计减免税额", "累计已预扣预缴税额", "累计婴幼儿照护", "累计个人养老金"); - //排序配置 - OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); - param.setOrderRule(orderRule); - List list = biz.list(param); - // 开启分权并且不是薪酬模块总管理员 - if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) { - List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); - list = list.stream().filter(f -> - taxAgentIdsAsAdmin.contains(f.getTaxAgentId()) - ).collect(Collectors.toList()); - } - - final List> dataRowList = Optional.ofNullable(list) - .map(List::stream) - .map(operatorStream -> operatorStream.map(dto -> { - List cellList = new ArrayList<>(); - cellList.add(Util.null2String(dto.getUsername())); - cellList.add(Util.null2String(dto.getTaxAgentName())); - cellList.add(Util.null2String(dto.getDepartmentName())); - cellList.add(Util.null2String(dto.getMobile())); - cellList.add(Util.null2String(dto.getJobNum())); - cellList.add(Util.null2String(dto.getIdNo())); - cellList.add(Util.null2String(dto.getHiredate())); - cellList.add(Util.null2String(dto.getAddUpIncome())); - cellList.add(Util.null2String(dto.getAddUpSubtraction())); - cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal())); - cellList.add(Util.null2String(dto.getAddUpAccumulationFundTotal())); - cellList.add(Util.null2String(dto.getAddUpChildEducation())); - cellList.add(Util.null2String(dto.getAddUpContinuingEducation())); - cellList.add(Util.null2String(dto.getAddUpHousingLoanInterest())); - cellList.add(Util.null2String(dto.getAddUpHousingRent())); - cellList.add(Util.null2String(dto.getAddUpSupportElderly())); - cellList.add(Util.null2String(dto.getAddUpIllnessMedical())); - cellList.add(Util.null2String(dto.getAddUpEnterpriseAndOther())); - cellList.add(Util.null2String(dto.getAddUpOtherDeduction())); - cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome())); - cellList.add(Util.null2String(dto.getAddUpAllowedDonation())); - cellList.add(Util.null2String(dto.getAddUpTaxSavings())); - cellList.add(Util.null2String(dto.getAddUpAdvanceTax())); - cellList.add(Util.null2String(dto.getAddUpInfantCare())); - cellList.add(Util.null2String(dto.getAddUpPrivatePension())); - return cellList; - }).collect(Collectors.toList())) - .orElse(Collections.emptyList()); - - List> rowList = new ArrayList<>(); + List> rowList = new ArrayList<>(); rowList.add(title); - rowList.addAll(dataRowList); + + if (hasData) { + //排序配置 + OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); + param.setOrderRule(orderRule); + List list = biz.list(param); + // 开启分权并且不是薪酬模块总管理员 + if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) { + List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); + list = list.stream().filter(f -> + taxAgentIdsAsAdmin.contains(f.getTaxAgentId()) + ).collect(Collectors.toList()); + } + + final List> dataRowList = Optional.ofNullable(list) + .map(List::stream) + .map(operatorStream -> operatorStream.map(dto -> { + List cellList = new ArrayList<>(); + cellList.add(Util.null2String(dto.getUsername())); + cellList.add(Util.null2String(dto.getTaxAgentName())); + cellList.add(Util.null2String(dto.getDepartmentName())); + cellList.add(Util.null2String(dto.getMobile())); + cellList.add(Util.null2String(dto.getJobNum())); + cellList.add(Util.null2String(dto.getIdNo())); + cellList.add(Util.null2String(dto.getHiredate())); + cellList.add(Util.null2String(dto.getAddUpIncome())); + cellList.add(Util.null2String(dto.getAddUpSubtraction())); + cellList.add(Util.null2String(dto.getAddUpSocialSecurityTotal())); + cellList.add(Util.null2String(dto.getAddUpAccumulationFundTotal())); + cellList.add(Util.null2String(dto.getAddUpChildEducation())); + cellList.add(Util.null2String(dto.getAddUpContinuingEducation())); + cellList.add(Util.null2String(dto.getAddUpHousingLoanInterest())); + cellList.add(Util.null2String(dto.getAddUpHousingRent())); + cellList.add(Util.null2String(dto.getAddUpSupportElderly())); + cellList.add(Util.null2String(dto.getAddUpIllnessMedical())); + cellList.add(Util.null2String(dto.getAddUpEnterpriseAndOther())); + cellList.add(Util.null2String(dto.getAddUpOtherDeduction())); + cellList.add(Util.null2String(dto.getAddUpTaxExemptIncome())); + cellList.add(Util.null2String(dto.getAddUpAllowedDonation())); + cellList.add(Util.null2String(dto.getAddUpTaxSavings())); + cellList.add(Util.null2String(dto.getAddUpAdvanceTax())); + cellList.add(Util.null2String(dto.getAddUpInfantCare())); + cellList.add(Util.null2String(dto.getAddUpPrivatePension())); + return cellList; + }).collect(Collectors.toList())) + .orElse(Collections.emptyList()); + + rowList.addAll(dataRowList); + } return rowList; } @@ -446,88 +449,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation @Override public XSSFWorkbook downloadTemplate(AddUpSituationQueryParam queryParam) { String sheetName = SalaryI18nUtil.getI18nLabel(101605, "往期累计情况导入模板"); - String[] header = { - SalaryI18nUtil.getI18nLabel(85429, "姓名"), - SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), - SalaryI18nUtil.getI18nLabel(86185, "部门"), - SalaryI18nUtil.getI18nLabel(86186, "手机号"), - SalaryI18nUtil.getI18nLabel(86317, "工号"), - SalaryI18nUtil.getI18nLabel(86318, "证件号码"), - SalaryI18nUtil.getI18nLabel(86319, "入职日期"), - SalaryI18nUtil.getI18nLabel(86712, "累计收入额"), - SalaryI18nUtil.getI18nLabel(86711, "累计减除费用"), - SalaryI18nUtil.getI18nLabel(86710, "累计社保个人合计"), - SalaryI18nUtil.getI18nLabel(86709, "累计公积金个人合计"), - SalaryI18nUtil.getI18nLabel(86321, "累计子女教育"), - SalaryI18nUtil.getI18nLabel(86323, "累计继续教育"), - SalaryI18nUtil.getI18nLabel(86324, "累计住房贷款利息"), - SalaryI18nUtil.getI18nLabel(86325, "累计住房租金"), - SalaryI18nUtil.getI18nLabel(86326, "累计赡养老人"), - SalaryI18nUtil.getI18nLabel(105142, "累计大病医疗"), - SalaryI18nUtil.getI18nLabel(90567, "累计企业（职业）年金及其他福利"), - SalaryI18nUtil.getI18nLabel(93902, "累计其他免税扣除"), - SalaryI18nUtil.getI18nLabel(86704, "累计免税收入"), - SalaryI18nUtil.getI18nLabel(86703, "累计准予扣除的捐赠额"), - SalaryI18nUtil.getI18nLabel(105478, "累计减免税额"), - SalaryI18nUtil.getI18nLabel(86702, "累计已预扣预缴税额"), - SalaryI18nUtil.getI18nLabel(86702, "累计婴幼儿照护"), - SalaryI18nUtil.getI18nLabel(86702, "累计个人养老金") - }; - // 2.表头 - List headerList = Arrays.asList(header); - List> rows = new ArrayList<>(); - rows.add(headerList); - -// // 获取累计情况 -// List taxYearMonth = queryParam.getTaxYearMonth(); -// if (CollectionUtils.isNotEmpty(taxYearMonth)) { -// queryParam.setTaxYearMonth(taxYearMonth.stream().map(e -> e + "-01 00:00:00").collect(Collectors.toList())); -// queryParam.setTaxYearMonthDate(taxYearMonth.stream().map(e -> e + "-01 00:00:00").map(SalaryDateUtil::dateStrToLocalTime).collect(Collectors.toList())); -// } - - // 开启分权并且不是薪酬模块总管理员 - List list = getAddUpSituationMapper().list(queryParam); - long employeeId = user.getUID(); - if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) { - List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); - list = list.stream().filter(f -> - taxAgentIdsAsAdmin.contains(f.getTaxAgentId()) - ).collect(Collectors.toList()); - } -// // 人员信息赋值 -// list.forEach(m -> { -// // todo 身份证号 -// m.setIdNo(""); -// }); -// - for (AddUpSituationDTO dto : list) { - List row = new ArrayList<>(); - row.add(Util.null2String(dto.getUsername())); - row.add(Util.null2String(dto.getTaxAgentName())); - row.add(Util.null2String(dto.getDepartmentName())); - row.add(Util.null2String(dto.getMobile())); - row.add(Util.null2String(dto.getJobNum())); - row.add(Util.null2String(dto.getIdNo())); - row.add(Util.null2String(dto.getHiredate())); -// row.add(Util.null2String(dto.getAddUpIncome())); -// row.add(Util.null2String(dto.getAddUpSubtraction())); -// row.add(Util.null2String(dto.getAddUpSocialSecurityTotal())); -// row.add(Util.null2String(dto.getAddUpAccumulationFundTotal())); -// row.add(Util.null2String(dto.getAddUpChildEducation())); -// row.add(Util.null2String(dto.getAddUpContinuingEducation())); -// row.add(Util.null2String(dto.getAddUpHousingLoanInterest())); -// row.add(Util.null2String(dto.getAddUpHousingRent())); -// row.add(Util.null2String(dto.getAddUpSupportElderly())); -// row.add(Util.null2String(dto.getAddUpIllnessMedical())); -// row.add(Util.null2String(dto.getAddUpEnterpriseAndOther())); -// row.add(Util.null2String(dto.getAddUpOtherDeduction())); -// row.add(Util.null2String(dto.getAddUpTaxExemptIncome())); -// row.add(Util.null2String(dto.getAddUpAllowedDonation())); -// row.add(Util.null2String(dto.getAddUpTaxSavings())); -// row.add(Util.null2String(dto.getAddUpAdvanceTax())); -// row.add(Util.null2String(dto.getAddUpInfantCare())); - rows.add(row); - } + // 获取操作按钮资源 + List> rowList = getExcelRowList(queryParam, queryParam.isHasData()); // 4.注释 List excelComments = Lists.newArrayList(); excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(100344, "必填"))); @@ -551,7 +474,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation excelComments.add(new ExcelComment(23, 0, 28, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(24, 0, 29, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - return ExcelUtil.genWorkbookV2(rows, sheetName, excelComments); + return ExcelUtil.genWorkbookV2(rowList, sheetName, excelComments); } @Override @@ -681,7 +604,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation String workcode = dto.getJobNum(); //筛选导入人员信息可以在人力资源池中匹配到的人员信息 - List employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null); + List employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null); //当人员信息导入筛选的全局配置为"0"时，姓名才是必填项 if (StringUtils.isBlank(userName) && "0".equals(confValue)) { diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index 837427adb..0a88f9b0d 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -250,7 +250,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction List employeeSameIds = new ArrayList<>(); //筛选导入人员信息可以在人力资源池中匹配到的人员信息 - List emps = getSalaryEmployeeService(user).matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null); + List emps = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null); //含在职和离职，选在职数据 if (CollectionUtils.isNotEmpty(emps) && emps.size() > 1) { employeeSameIds = emps.stream() @@ -434,13 +434,13 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction if (CollectionUtils.isNotEmpty(updateList)) { LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setUser(user); - if (updateList.size() ==1) { + if (updateList.size() == 1) { loggerContext.setTargetId(updateList.get(0).getId().toString()); } - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "其他免税扣除")); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "其他免税扣除")); 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.setNewValueList(updateList); SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); } @@ -472,7 +472,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction public XSSFWorkbook export(OtherDeductionQueryParam param) { //获取操作按钮资源 - List> rowList = getExcelRowList(param); + List> rowList = getExcelRowList(param,true); // 记录日志 String name = SalaryI18nUtil.getI18nLabel(0, "导出"); @@ -485,7 +485,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); //获取excel - return ExcelUtil.genWorkbook(rowList, "其他免税扣除"); + return ExcelUtil.genWorkbookV2(rowList, "其他免税扣除"); } @@ -494,56 +494,53 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction * * @return 导出数据行集合 */ - private List> getExcelRowList(OtherDeductionQueryParam param) { + private List> getExcelRowList(OtherDeductionQueryParam param, boolean hasData) { long employeeId = user.getUID(); //excel标题 - List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额", "个人养老金"); - //排序配置 - OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); - param.setOrderRule(orderRule); - - //申报月份 - List declareMonth = param.getDeclareMonth(); - if (CollectionUtils.isNotEmpty(declareMonth)) { - param.setDeclareMonth(declareMonth.stream().map(e -> e + "-01 00:00:00").collect(Collectors.toList())); - param.setDeclareMonthDate(declareMonth.stream().map(e -> e + "-01 00:00:00").map(SalaryDateUtil::dateStrToLocalTime).collect(Collectors.toList())); - } - - List list = getOtherDeductionMapper().list(param); - encryptUtil.decryptList(list, OtherDeductionListDTO.class); - // 开启分权并且不是薪酬模块总管理员 - if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) { - List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); - list = list.stream().filter(f -> - // 作为管理员 - taxAgentIdsAsAdmin.contains(f.getTaxAgentId()) - ).collect(Collectors.toList()); - } - - - final List> dataRowList = Optional.ofNullable(list) - .map(List::stream) - .map(operatorStream -> operatorStream.map(dto -> { - List cellList = new ArrayList<>(); - cellList.add(Util.null2String(dto.getUsername())); - cellList.add(Util.null2String(dto.getTaxAgentName())); - cellList.add(Util.null2String(dto.getDepartmentName())); - cellList.add(Util.null2String(dto.getMobile())); - cellList.add(Util.null2String(dto.getJobNum())); - cellList.add(Util.null2String(dto.getIdNo())); - cellList.add(Util.null2String(dto.getHiredate())); - cellList.add(Util.null2String(dto.getBusinessHealthyInsurance())); - cellList.add(Util.null2String(dto.getTaxDelayEndowmentInsurance())); - cellList.add(Util.null2String(dto.getOtherDeduction())); - cellList.add(Util.null2String(dto.getDeductionAllowedDonation())); - cellList.add(Util.null2String(dto.getPrivatePension())); - return cellList; - }).collect(Collectors.toList())) - .orElse(Collections.emptyList()); - - List> rowList = new ArrayList<>(); + List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "商业健康保险", "税延养老保险", "其他", "准予扣除的捐赠额", "个人养老金"); + List> rowList = new ArrayList<>(); rowList.add(title); - rowList.addAll(dataRowList); + + if (hasData) { + //排序配置 + OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); + param.setOrderRule(orderRule); + + List list = getOtherDeductionMapper().list(param); + encryptUtil.decryptList(list, OtherDeductionListDTO.class); + SalaryI18nUtil.i18nList(list); + // 开启分权并且不是薪酬模块总管理员 + if (getTaxAgentService(user).isOpenDevolution() && !getTaxAgentService(user).isChief(employeeId)) { + List taxAgentIdsAsAdmin = getTaxAgentService(user).listAllTaxAgentsAsAdmin(employeeId).stream().map(TaxAgentPO::getId).collect(Collectors.toList()); + list = list.stream().filter(f -> + // 作为管理员 + taxAgentIdsAsAdmin.contains(f.getTaxAgentId()) + ).collect(Collectors.toList()); + } + + final List> dataRowList = Optional.ofNullable(list) + .map(List::stream) + .map(operatorStream -> operatorStream.map(dto -> { + List cellList = new ArrayList<>(); + cellList.add(Util.null2String(dto.getUsername())); + cellList.add(Util.null2String(dto.getTaxAgentName())); + cellList.add(Util.null2String(dto.getDepartmentName())); + cellList.add(Util.null2String(dto.getMobile())); + cellList.add(Util.null2String(dto.getJobNum())); + cellList.add(Util.null2String(dto.getIdNo())); + cellList.add(Util.null2String(dto.getHiredate())); + cellList.add(Util.null2String(dto.getBusinessHealthyInsurance())); + cellList.add(Util.null2String(dto.getTaxDelayEndowmentInsurance())); + cellList.add(Util.null2String(dto.getOtherDeduction())); + cellList.add(Util.null2String(dto.getDeductionAllowedDonation())); + cellList.add(Util.null2String(dto.getPrivatePension())); + return cellList; + }).collect(Collectors.toList())) + .orElse(Collections.emptyList()); + + rowList.addAll(dataRowList); + } + return rowList; } @@ -988,13 +985,13 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction }); if (CollectionUtils.isNotEmpty(updatetInfo)) { - String yearMonthStr = SalaryDateUtil.getFormatYearMonth(lastMonth.toLocalDate()) ; + String yearMonthStr = SalaryDateUtil.getFormatYearMonth(lastMonth.toLocalDate()); LoggerContext loggerContext = new LoggerContext(); loggerContext.setUser(user); - loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "沿用上月 "+yearMonthStr)); + loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "沿用上月 " + yearMonthStr)); loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "沿用上月其他免税扣除")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "沿用上月 "+ yearMonthStr +" 其他免税扣除")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "沿用上月 " + yearMonthStr + " 其他免税扣除")); loggerContext.setNewValueList(updatetInfo); SalaryElogConfig.otherDeductionLoggerTemplate.write(loggerContext); } @@ -1006,23 +1003,8 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction public XSSFWorkbook downloadTemplate(OtherDeductionQueryParam param) { // 1.工作簿名称 String sheetName = SalaryI18nUtil.getI18nLabel(101604, "其他免税扣除导入模板"); - String[] header = { - SalaryI18nUtil.getI18nLabel(85429, "姓名"), - SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), - SalaryI18nUtil.getI18nLabel(86185, "部门"), - SalaryI18nUtil.getI18nLabel(86186, "手机号"), - SalaryI18nUtil.getI18nLabel(86317, "工号"), - SalaryI18nUtil.getI18nLabel(86318, "证件号码"), - SalaryI18nUtil.getI18nLabel(86319, "入职日期"), - SalaryI18nUtil.getI18nLabel(91238, "商业健康保险"), - SalaryI18nUtil.getI18nLabel(91239, "税延养老保险"), - SalaryI18nUtil.getI18nLabel(84500, "其他"), - SalaryI18nUtil.getI18nLabel(91240, "准予扣除的捐赠额") - }; - // 2.表头 - List> rows = new ArrayList<>(); - List headerList = Arrays.asList(header); - rows.add(headerList); + //获取操作按钮资源 + List> rowList = getExcelRowList(param,param.isHasData()); // 4.注释 List excelComments = Lists.newArrayList(); @@ -1032,8 +1014,9 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction excelComments.add(new ExcelComment(8, 0, 11, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(9, 0, 12, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); excelComments.add(new ExcelComment(10, 0, 13, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); + excelComments.add(new ExcelComment(11, 0, 14, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - XSSFWorkbook book = ExcelUtil.genWorkbookV2(rows, sheetName, excelComments); + XSSFWorkbook book = ExcelUtil.genWorkbookV2(rowList, sheetName, excelComments); return book; } diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index 2aefb914c..739c19d24 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -243,7 +243,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd //筛选导入人员信息可以在人力资源池中匹配到的人员信息 List emps = getSalaryEmployeeService(user) - .matchImportEmployee(confValue,employees, userName, deparmentName, mobile, workcode, null); + .matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, null); //含在职和离职，选在职数据 if (CollectionUtils.isNotEmpty(emps) && emps.size() > 1) { employeeSameIds = emps.stream() @@ -396,7 +396,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd List> rowList = new ArrayList<>(); rowList.add(title); - if (!isTemplate) { + if (!isTemplate || param.isHasData()) { // 非下载导入模版，查询数据填充 List> dataRowList = queryInfoForExcel(param, rowList); rowList.addAll(dataRowList); @@ -626,10 +626,10 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd oldSpecialAddDeductionList.add(byId); } SpecialAddDeductionBiz.batchDeleteByIds(deleteList); - + // 记录操作日志 if (CollectionUtils.isNotEmpty(oldSpecialAddDeductionList)) { - oldSpecialAddDeductionList.stream().forEach( e -> { + oldSpecialAddDeductionList.stream().forEach(e -> { LoggerContext loggerContext = new LoggerContext<>(); loggerContext.setTargetId(e.getId().toString()); loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "专项附加扣除") + "-" + e.getId()); @@ -671,7 +671,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd specialAddDeductionBiz.batchDeleteByIds(deleteIds); // 记录操作日志 - Collection finalTaxAgentIds =taxAgentIds; + Collection finalTaxAgentIds = taxAgentIds; List taxAgentNames = taxAgentList.stream().filter(t -> finalTaxAgentIds.contains(t.getTaxAgentId())) .map(TaxAgentManageRangeEmployeeDTO::getTaxAgentName).collect(Collectors.toList()); String name = StringUtils.join(taxAgentNames, ","); @@ -692,9 +692,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd @Override public SpecialAddDeductionRecordDTO getRecordById(Long id) { - return getSpecialAddDeductionBiz() - .listDTOByParam(SpecialAddDeductionQueryParam.builder().specialAddDeductionId(id).build()) - .stream().findFirst().orElse(null); + return getSpecialAddDeductionBiz().listDTOByParam(SpecialAddDeductionQueryParam.builder().specialAddDeductionId(id).build()).stream().findFirst().orElse(null); } private List> queryInfoForExcel(SpecialAddDeductionQueryParam param, List> rowList) { diff --git a/src/com/engine/salary/web/AddUpDeductionController.java b/src/com/engine/salary/web/AddUpDeductionController.java index b153fd475..f5c4e0d6b 100644 --- a/src/com/engine/salary/web/AddUpDeductionController.java +++ b/src/com/engine/salary/web/AddUpDeductionController.java @@ -251,6 +251,10 @@ public class AddUpDeductionController { if (StringUtils.isNotBlank(accumulatedSpecialAdditionalDeductionId)) { param.setAccumulatedSpecialAdditionalDeductionId(Long.valueOf(accumulatedSpecialAdditionalDeductionId)); } + String hasData = request.getParameter("hasData"); + if (StringUtils.isNotBlank(hasData)) { + param.setHasData("true".equals(hasData)); + } return param; } diff --git a/src/com/engine/salary/web/AddUpSituationController.java b/src/com/engine/salary/web/AddUpSituationController.java index 0c31aa578..c10443a88 100644 --- a/src/com/engine/salary/web/AddUpSituationController.java +++ b/src/com/engine/salary/web/AddUpSituationController.java @@ -261,6 +261,10 @@ public class AddUpSituationController { if (StringUtils.isNotBlank(accumulatedSituationId)) { param.setAccumulatedSituationId(Long.valueOf(accumulatedSituationId)); } + String hasData = request.getParameter("hasData"); + if (StringUtils.isNotBlank(hasData)) { + param.setHasData("true".equals(hasData)); + } return param; } diff --git a/src/com/engine/salary/web/OtherDeductionController.java b/src/com/engine/salary/web/OtherDeductionController.java index d930daa5a..251507f68 100644 --- a/src/com/engine/salary/web/OtherDeductionController.java +++ b/src/com/engine/salary/web/OtherDeductionController.java @@ -254,6 +254,11 @@ public class OtherDeductionController { if (StringUtils.isNotBlank(otherTaxExemptDeductionId)) { param.setOtherTaxExemptDeductionId(Long.valueOf(otherTaxExemptDeductionId)); } + + String hasData = request.getParameter("hasData"); + if (StringUtils.isNotBlank(hasData)) { + param.setHasData("true".equals(hasData)); + } return param; } diff --git a/src/com/engine/salary/web/SpecialAddDeductionController.java b/src/com/engine/salary/web/SpecialAddDeductionController.java index 7b6f0eb45..891f48d91 100644 --- a/src/com/engine/salary/web/SpecialAddDeductionController.java +++ b/src/com/engine/salary/web/SpecialAddDeductionController.java @@ -3,8 +3,10 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionListDTO; import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO; -import com.engine.salary.entity.datacollection.param.*; -import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionImportParam; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionParam; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionQueryParam; +import com.engine.salary.entity.datacollection.param.SpecialAddDeductionRecordDeleteParam; import com.engine.salary.util.ResponseResult; import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.SpecialAddDeductionWrapper; @@ -16,7 +18,6 @@ import org.jetbrains.annotations.Nullable; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; -import javax.security.sasl.SaslException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.GET; @@ -258,6 +259,10 @@ public class SpecialAddDeductionController { if (StringUtils.isNotBlank(otherTaxExemptDeductionId)) { param.setSpecialAddDeductionId(Long.valueOf(otherTaxExemptDeductionId)); } + String hasData = request.getParameter("hasData"); + if (StringUtils.isNotBlank(hasData)) { + param.setHasData("true".equals(hasData)); + } return param; } diff --git a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java index aa89c3c58..9d0229528 100644 --- a/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java +++ b/src/com/engine/salary/wrapper/AddUpDeductionWrapper.java @@ -103,8 +103,7 @@ public class AddUpDeductionWrapper extends Service { * @return */ public XSSFWorkbook export(AddUpDeductionQueryParam queryParam) { - boolean isChief = getTaxAgentService(user).isChief((long) user.getUID()); - return getAddUpDeductionService(user).export(isChief, queryParam); + return getAddUpDeductionService(user).export( queryParam); } /** diff --git a/src/com/engine/salary/wrapper/OtherDeductionWrapper.java b/src/com/engine/salary/wrapper/OtherDeductionWrapper.java index 514fa7833..3002e8cfd 100644 --- a/src/com/engine/salary/wrapper/OtherDeductionWrapper.java +++ b/src/com/engine/salary/wrapper/OtherDeductionWrapper.java @@ -196,7 +196,7 @@ public class OtherDeductionWrapper extends Service { * @return */ public XSSFWorkbook downloadTemplate(OtherDeductionQueryParam queryParam) { - return getOtherDeductionService(user).export(queryParam); + return getOtherDeductionService(user).downloadTemplate(queryParam); } /** From 29e81e03c27daeead19907d4af035ab1708a3418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 14 Mar 2024 16:08:16 +0800 Subject: [PATCH 161/169] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E5=BC=8F?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9C=AA=E5=90=AF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacollection/param/AttendQuoteFieldQueryParam.java | 2 ++ .../salary/mapper/datacollection/AttendQuoteFieldMapper.xml | 3 +++ .../engine/salary/service/impl/RemoteExcelServiceImpl.java | 2 +- .../salary/service/impl/SpecialAddDeductionServiceImpl.java | 4 +++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/datacollection/param/AttendQuoteFieldQueryParam.java b/src/com/engine/salary/entity/datacollection/param/AttendQuoteFieldQueryParam.java index 3f1f0a832..40eb45720 100644 --- a/src/com/engine/salary/entity/datacollection/param/AttendQuoteFieldQueryParam.java +++ b/src/com/engine/salary/entity/datacollection/param/AttendQuoteFieldQueryParam.java @@ -38,6 +38,8 @@ public class AttendQuoteFieldQueryParam extends BaseQueryParam { //来源。1：自定义、2：考勤模块 private Integer sourceType; + private Integer enableStatus; + /** * 查询where语句 * diff --git a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml index 0f3791981..4c1ae10ee 100644 --- a/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AttendQuoteFieldMapper.xml @@ -357,6 +357,9 @@ WHERE t1.delete_type = 0 + + AND enable_status = #{param.enableStatus} + ORDER BY t1.source_type,t1.id DESC diff --git a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java index b38a6d302..57a098cca 100644 --- a/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/RemoteExcelServiceImpl.java @@ -445,7 +445,7 @@ public class RemoteExcelServiceImpl extends Service implements RemoteExcelServic } private List attendData2FormulaVar(SalaryFormulaReferenceEnum referenceEnum) { - List fields = getAttendQuoteFieldMapper().list(AttendQuoteFieldQueryParam.builder().build()); + List fields = getAttendQuoteFieldMapper().list(AttendQuoteFieldQueryParam.builder().enableStatus(1).build()); if (CollectionUtils.isEmpty(fields)) { return null; } diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index 739c19d24..a645ab054 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.salary.service.impl; +import cn.hutool.core.collection.CollUtil; import com.api.formmode.mybatis.util.SqlProxyHandle; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; @@ -692,7 +693,8 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd @Override public SpecialAddDeductionRecordDTO getRecordById(Long id) { - return getSpecialAddDeductionBiz().listDTOByParam(SpecialAddDeductionQueryParam.builder().specialAddDeductionId(id).build()).stream().findFirst().orElse(null); + List specialAddDeductionRecordDTOList = getSpecialAddDeductionBiz().listDTOByParam(SpecialAddDeductionQueryParam.builder().specialAddDeductionId(id).build()); + return CollUtil.isNotEmpty(specialAddDeductionRecordDTOList) ? specialAddDeductionRecordDTOList.get(0) : null; } private List> queryInfoForExcel(SpecialAddDeductionQueryParam param, List> rowList) { From 0a7334ddef2ecf09203a6bfa3ffe31a46ba4f8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 14 Mar 2024 18:16:20 +0800 Subject: [PATCH 162/169] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/AddUpDeductionBiz.java | 4 +++- src/com/engine/salary/biz/AttendQuoteDataBiz.java | 4 +++- .../datacollection/dto/AddUpDeductionDTO.java | 2 ++ .../datacollection/dto/AttendQuoteDataBaseDTO.java | 3 +++ .../service/impl/AddUpDeductionServiceImpl.java | 14 ++++++++++---- .../service/impl/AddUpSituationServiceImpl.java | 10 +++++++--- .../service/impl/OtherDeductionServiceImpl.java | 14 +++++++++----- .../impl/SpecialAddDeductionServiceImpl.java | 12 +++++++----- 8 files changed, 44 insertions(+), 19 deletions(-) diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java index ef512160b..14ba5933c 100644 --- a/src/com/engine/salary/biz/AddUpDeductionBiz.java +++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO; import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO; import com.engine.salary.entity.datacollection.param.AddUpDeductionQueryParam; import com.engine.salary.mapper.datacollection.AddUpDeductionMapper; +import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; @@ -31,7 +32,8 @@ public class AddUpDeductionBiz extends BaseBean { try { AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class); List list = mapper.list(param); - list = encryptUtil.decryptList(list, AddUpDeductionDTO.class); + encryptUtil.decryptList(list, AddUpDeductionDTO.class); + SalaryI18nUtil.i18nList(list); return list; } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/AttendQuoteDataBiz.java b/src/com/engine/salary/biz/AttendQuoteDataBiz.java index 8af27e8ba..f3b456fdf 100644 --- a/src/com/engine/salary/biz/AttendQuoteDataBiz.java +++ b/src/com/engine/salary/biz/AttendQuoteDataBiz.java @@ -4,6 +4,7 @@ import com.engine.salary.entity.datacollection.dto.AttendQuoteDataBaseDTO; import com.engine.salary.entity.datacollection.param.AttendQuoteDataQueryParam; import com.engine.salary.entity.datacollection.po.AttendQuoteDataPO; import com.engine.salary.mapper.datacollection.AttendQuoteDataMapper; +import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; @@ -17,7 +18,8 @@ public class AttendQuoteDataBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AttendQuoteDataMapper mapper = sqlSession.getMapper(AttendQuoteDataMapper.class); - return mapper.list(param); + List list = mapper.list(param); + return SalaryI18nUtil.i18nList(list); } finally { sqlSession.close(); } diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java index c44181818..b16ebacf6 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AddUpDeductionDTO.java @@ -43,6 +43,7 @@ public class AddUpDeductionDTO { @ExcelProperty(index = 0) @SalaryTableColumn(text = "姓名", width = "10%", column = "username") @TableTitle(title = "姓名", dataIndex = "username", key = "username") + @I18n private String username; /** @@ -64,6 +65,7 @@ public class AddUpDeductionDTO { @ExcelProperty(index = 2) @SalaryTableColumn(text = "部门", width = "10%", column = "departmentName") @TableTitle(title = "部门", dataIndex = "departmentName", key = "departmentName") + @I18n private String departmentName; /** diff --git a/src/com/engine/salary/entity/datacollection/dto/AttendQuoteDataBaseDTO.java b/src/com/engine/salary/entity/datacollection/dto/AttendQuoteDataBaseDTO.java index e261a0f59..a3b7ea962 100644 --- a/src/com/engine/salary/entity/datacollection/dto/AttendQuoteDataBaseDTO.java +++ b/src/com/engine/salary/entity/datacollection/dto/AttendQuoteDataBaseDTO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.datacollection.dto; +import com.engine.salary.annotation.I18n; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,11 +35,13 @@ public class AttendQuoteDataBaseDTO { /** * 姓名 */ + @I18n private String username; /** * 部门 */ + @I18n private String departmentName; /** diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 5817e89de..f2bf7b9d8 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -46,6 +46,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelComment; import com.engine.salary.util.excel.ExcelParseHelper; +import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -54,6 +55,7 @@ import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; +import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.file.ImageFileManager; @@ -67,6 +69,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; +import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; /** * 累计专项 @@ -700,12 +703,12 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction .map(TaxAgentManageRangeEmployeeDTO::getTaxAgentName).collect(Collectors.toList()); String name = declareMonthStr + " " + StringUtils.join(taxAgentNames, ","); LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); loggerContext.setTargetName(name); loggerContext.setOperateType(OperateTypeEnum.CLEAR.getValue()); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "一键清空")); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "累计专项附加扣除") + "-" + SalaryI18nUtil .getI18nLabel(0, "一键清空：") + name); - loggerContext.setUser(user); SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext); } @@ -939,14 +942,17 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Validate.notBlank(imageId, "imageId为空"); InputStream fileInputStream = null; + try { fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(imageId)); - List addUpDeductions = ExcelParseHelper.parse2Map(fileInputStream, AddUpDeductionDTO.class, 0, 1, 14, "addUpDeductionTemplate.xlsx"); - apidatas.put("preview", addUpDeductions); + Sheet sheet = ExcelSupport.parseFile(fileInputStream, 0, EXCEL_TYPE_XLSX); + apidatas.put("headers", ExcelSupport.getSheetHeader(sheet, 0)); + apidatas.put("list", ExcelParseHelper.parse2List(sheet, 1, 0)); + return apidatas; + } finally { IOUtils.closeQuietly(fileInputStream); } - return apidatas; } diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index 5f503572d..9c7994261 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -41,6 +41,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelComment; import com.engine.salary.util.excel.ExcelParseHelper; +import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -48,6 +49,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.file.ImageFileManager; @@ -63,6 +65,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; +import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; public class AddUpSituationServiceImpl extends Service implements AddUpSituationService { private EncryptUtil encryptUtil = new EncryptUtil(); @@ -507,12 +510,13 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation InputStream fileInputStream = null; try { fileInputStream = ImageFileManager.getInputStreamById(Integer.valueOf(imageId)); - List excelDates = ExcelParseHelper.parse2Map(fileInputStream, AddUpSituationDTO.class, 0, 1, 25, "template.xlsx"); - apidatas.put("preview", excelDates); + Sheet sheet = ExcelSupport.parseFile(fileInputStream, 0, EXCEL_TYPE_XLSX); + apidatas.put("headers", ExcelSupport.getSheetHeader(sheet, 0)); + apidatas.put("list", ExcelParseHelper.parse2List(sheet, 1, 0)); + return apidatas; } finally { IOUtils.closeQuietly(fileInputStream); } - return apidatas; } diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index 0a88f9b0d..6ac7b89cf 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -37,6 +37,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelComment; import com.engine.salary.util.excel.ExcelParseHelper; +import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -45,6 +46,7 @@ import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; +import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.file.ImageFileManager; @@ -59,6 +61,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; +import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; public class OtherDeductionServiceImpl extends Service implements OtherDeductionService { private EncryptUtil encryptUtil = new EncryptUtil(); @@ -165,12 +168,13 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction InputStream fileInputStream = null; try { fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(imageId)); - List OtherDeductions = ExcelParseHelper.parse2Map(fileInputStream, OtherDeductionListDTO.class, 0, 1, 12, "OtherDeductionTemplate.xlsx"); - apidatas.put("preview", OtherDeductions); + Sheet sheet = ExcelSupport.parseFile(fileInputStream, 0, EXCEL_TYPE_XLSX); + apidatas.put("headers", ExcelSupport.getSheetHeader(sheet, 0)); + apidatas.put("list", ExcelParseHelper.parse2List(sheet, 1, 0)); + return apidatas; } finally { IOUtils.closeQuietly(fileInputStream); } - return apidatas; } @@ -472,7 +476,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction public XSSFWorkbook export(OtherDeductionQueryParam param) { //获取操作按钮资源 - List> rowList = getExcelRowList(param,true); + List> rowList = getExcelRowList(param, true); // 记录日志 String name = SalaryI18nUtil.getI18nLabel(0, "导出"); @@ -1004,7 +1008,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction // 1.工作簿名称 String sheetName = SalaryI18nUtil.getI18nLabel(101604, "其他免税扣除导入模板"); //获取操作按钮资源 - List> rowList = getExcelRowList(param,param.isHasData()); + List> rowList = getExcelRowList(param, param.isHasData()); // 4.注释 List excelComments = Lists.newArrayList(); diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index a645ab054..cd8cc1c83 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -37,6 +37,7 @@ import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; +import com.engine.salary.util.excel.ExcelSupport; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; @@ -44,6 +45,7 @@ import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; +import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.file.ImageFileManager; @@ -57,6 +59,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; +import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; public class SpecialAddDeductionServiceImpl extends Service implements SpecialAddDeductionService { private EncryptUtil encryptUtil = new EncryptUtil(); @@ -162,14 +165,13 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd InputStream fileInputStream = null; try { fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(imageId)); - List SpecialAddDeductions = - ExcelParseHelper.parse2Map(fileInputStream, SpecialAddDeductionListDTO.class, 0, 1, 14, - "SpecialAddDeductionTemplate.xlsx"); - apidatas.put("preview", SpecialAddDeductions); + Sheet sheet = ExcelSupport.parseFile(fileInputStream, 0, EXCEL_TYPE_XLSX); + apidatas.put("headers", ExcelSupport.getSheetHeader(sheet, 0)); + apidatas.put("list", ExcelParseHelper.parse2List(sheet, 1, 0)); + return apidatas; } finally { IOUtils.closeQuietly(fileInputStream); } - return apidatas; } From c3800881bc0c8bf648fb635d0f9811def75fdf9d Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 15 Mar 2024 09:31:04 +0800 Subject: [PATCH 163/169] sql --- resource/sqlupgrade/DM/sql202403150103.sql | 3 +++ resource/sqlupgrade/GS/sql202403150103.sql | 3 +++ resource/sqlupgrade/JC/sql202403150103.sql | 3 +++ resource/sqlupgrade/Mysql/sql202403150103.sql | 1 + resource/sqlupgrade/Oracle/sql202403150103.sql | 2 ++ resource/sqlupgrade/PG/sql202403150103.sql | 1 + resource/sqlupgrade/SQLServer/sql202403150103.sql | 2 ++ resource/sqlupgrade/ST/sql202403150103.sql | 3 +++ 8 files changed, 18 insertions(+) create mode 100644 resource/sqlupgrade/DM/sql202403150103.sql create mode 100644 resource/sqlupgrade/GS/sql202403150103.sql create mode 100644 resource/sqlupgrade/JC/sql202403150103.sql create mode 100644 resource/sqlupgrade/Mysql/sql202403150103.sql create mode 100644 resource/sqlupgrade/Oracle/sql202403150103.sql create mode 100644 resource/sqlupgrade/PG/sql202403150103.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202403150103.sql create mode 100644 resource/sqlupgrade/ST/sql202403150103.sql diff --git a/resource/sqlupgrade/DM/sql202403150103.sql b/resource/sqlupgrade/DM/sql202403150103.sql new file mode 100644 index 000000000..ddd68bf00 --- /dev/null +++ b/resource/sqlupgrade/DM/sql202403150103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_send_info add first_reading_time date; +/ + diff --git a/resource/sqlupgrade/GS/sql202403150103.sql b/resource/sqlupgrade/GS/sql202403150103.sql new file mode 100644 index 000000000..ddd68bf00 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202403150103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_send_info add first_reading_time date; +/ + diff --git a/resource/sqlupgrade/JC/sql202403150103.sql b/resource/sqlupgrade/JC/sql202403150103.sql new file mode 100644 index 000000000..ddd68bf00 --- /dev/null +++ b/resource/sqlupgrade/JC/sql202403150103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_send_info add first_reading_time date; +/ + diff --git a/resource/sqlupgrade/Mysql/sql202403150103.sql b/resource/sqlupgrade/Mysql/sql202403150103.sql new file mode 100644 index 000000000..5d98d2dad --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202403150103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_send_info add first_reading_time datetime; \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202403150103.sql b/resource/sqlupgrade/Oracle/sql202403150103.sql new file mode 100644 index 000000000..f2ba113a1 --- /dev/null +++ b/resource/sqlupgrade/Oracle/sql202403150103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_send_info add first_reading_time date +/ \ No newline at end of file diff --git a/resource/sqlupgrade/PG/sql202403150103.sql b/resource/sqlupgrade/PG/sql202403150103.sql new file mode 100644 index 000000000..4f331b378 --- /dev/null +++ b/resource/sqlupgrade/PG/sql202403150103.sql @@ -0,0 +1 @@ +alter table hrsa_salary_send_info add first_reading_time timestamp; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202403150103.sql b/resource/sqlupgrade/SQLServer/sql202403150103.sql new file mode 100644 index 000000000..f4fe70321 --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202403150103.sql @@ -0,0 +1,2 @@ +alter table hrsa_salary_send_info add first_reading_time datetime +GO \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202403150103.sql b/resource/sqlupgrade/ST/sql202403150103.sql new file mode 100644 index 000000000..ddd68bf00 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202403150103.sql @@ -0,0 +1,3 @@ +alter table hrsa_salary_send_info add first_reading_time date; +/ + From 08b2c240abea060c6dc1cec350e3eb84577088d7 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 15 Mar 2024 10:14:59 +0800 Subject: [PATCH 164/169] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 5a66005d6..a2e0a6415 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -514,7 +514,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService if (burningAfterReadingMin != null) { LocalDateTime limitTime = SalaryDateUtil.dateToLocalDateTime(firstReadingTime).plusMinutes(burningAfterReadingMin); LocalDateTime now = SalaryDateUtil.dateToLocalDateTime(new Date()); - if (limitTime.isBefore(now)) { + if (burningAfterReadingMin == 0) { + throw new SalaryRunTimeException("无法查看工资单，该工资单仅供查看一次。首次查看时间为：" + SalaryDateUtil.getFormatLocalDateTime(firstReadingTime)); + } else if (limitTime.isBefore(now)) { throw new SalaryRunTimeException("首次查看工资单" + burningAfterReadingMin + "分钟后，无法查看工资单。首次查看时间为：" + SalaryDateUtil.getFormatLocalDateTime(firstReadingTime)); } } From 80510c8cfcf299a33e9745a5379e6bbefda2544e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 15 Mar 2024 10:20:38 +0800 Subject: [PATCH 165/169] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalary.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index de3e0dac9..713f3d934 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=2.11.1.2402.01 +version=2.11.2.2403.01 openFormulaForcedEditing=false \ No newline at end of file From 68b4d29c404acbd96fce858b9459caacba6945b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 18 Mar 2024 09:54:59 +0800 Subject: [PATCH 166/169] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalary.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index 713f3d934..4ca5b1e88 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=2.11.2.2403.01 +version=2.12.1.2403.02 openFormulaForcedEditing=false \ No newline at end of file From 0c444acd388679ba23ecf101a7c28e0ecb8903e4 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 21 Mar 2024 14:19:03 +0800 Subject: [PATCH 167/169] =?UTF-8?q?=E5=A4=9A=E9=83=A8=E9=97=A8=E5=A4=9A?= =?UTF-8?q?=E5=88=86=E9=83=A8=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalarySendDetailListQueryParam.java | 7 +- .../param/SalarySendInfoQueryParam.java | 7 ++ .../param/InsuranceAccountDetailParam.java | 4 ++ .../salarybill/SalarySendInfoMapper.xml | 26 ++++++- .../InsuranceAccountDetailMapper.xml | 72 +++++++++++++++++++ .../salary/web/SalaryBillController.java | 14 +++- 6 files changed, 127 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java index e330f2818..ae526ad40 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java @@ -45,7 +45,12 @@ public class SalarySendDetailListQueryParam extends BaseQueryParam { private Long taxAgent; // 部门id") - private Long department; + private List departmentIds; + private String departmentIdStr; + + // 分部id + private List subCompanyIds; + private String subCompanyIdStr; // 岗位id") private Long position; diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java index 70e56384d..981524986 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java @@ -47,6 +47,9 @@ public class SalarySendInfoQueryParam extends BaseQueryParam { // 部门id") private List departmentIds; + // 分部id + private List subCompanyIds; + // 岗位id") private List positionIds; @@ -77,6 +80,10 @@ public class SalarySendInfoQueryParam extends BaseQueryParam { // @JsonIgnore private List sendStatuss; + private String departmentIdStr; + + private String subCompanyIdStr; + public static String checkParam(SalarySendInfoQueryParam saveParam) { if (saveParam.getSalarySendId() == null) { throw new SalaryRunTimeException("工资单发放Id必传"); diff --git a/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java b/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java index 2492513cd..b8e56f090 100644 --- a/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java +++ b/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java @@ -42,4 +42,8 @@ public class InsuranceAccountDetailParam extends BaseQueryParam { private Long creator; private String workcode; + + private List departmentIds; + + private List subCompanyIds; } diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index a7738491f..4870fdfde 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -381,6 +381,13 @@ and t1.send_status in (0, 2) + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -411,6 +418,12 @@ and t1.send_status in (0, 2) + + + AND e.subcompanyid1 IN + + #{subCompanyId} + @@ -441,7 +454,12 @@ and t1.send_status in (0, 2) - + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -513,6 +531,12 @@ )) + + AND e.subcompanyid1 IN + + #{subCompanyId} + + diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 82d0e6db3..55b55947e 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -203,6 +203,18 @@ #{taxAgent} + + AND e.departmentid IN + + #{departmentId} + + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -232,6 +244,18 @@ #{taxAgent} + + AND e.departmentid IN + + #{departmentId} + + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -261,6 +285,18 @@ #{taxAgent} + + AND e.departmentid IN + + #{departmentId} + + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -291,6 +327,18 @@ #{taxAgent} + + AND e.department_id IN + + #{departmentId} + + + + AND e.subcompany_id IN + + #{subCompanyId} + + @@ -320,6 +368,18 @@ #{taxAgent} + + AND e.department_id IN + + #{departmentId} + + + + AND e.subcompany_id IN + + #{subCompanyId} + + @@ -349,6 +409,18 @@ #{taxAgent} + + AND e.department_id IN + + #{departmentId} + + + + AND e.subcompany_id IN + + #{subCompanyId} + + diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java index 5468435dc..3b29aaea4 100644 --- a/src/com/engine/salary/web/SalaryBillController.java +++ b/src/com/engine/salary/web/SalaryBillController.java @@ -347,6 +347,12 @@ public class SalaryBillController { @Produces(MediaType.APPLICATION_JSON) public String infoList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySendInfoQueryParam queryParam) { User user = HrmUserVarify.getUser(request, response); + if (StringUtils.isNotBlank(queryParam.getDepartmentIdStr())) { + queryParam.setDepartmentIds(Arrays.stream(StringUtils.split(queryParam.getDepartmentIdStr(), ",")).map(Long::valueOf).collect(Collectors.toList())); + } + if (StringUtils.isNotBlank(queryParam.getSubCompanyIdStr())) { + queryParam.setSubCompanyIds(Arrays.stream(StringUtils.split(queryParam.getSubCompanyIdStr(), ",")).map(Long::valueOf).collect(Collectors.toList())); + } return new ResponseResult>(user).run(getSalarySendWrapper(user)::infoList, queryParam); } @@ -487,7 +493,7 @@ public class SalaryBillController { // 处理入参复用方法 SalarySendDetailQueryParam detailQueryParam = SalarySendDetailQueryParam.builder() .userId(queryParam.getUserId()) - .departmentIds(SalaryEntityUtil.isNullOrEmpty(queryParam.getDepartment()) ? null : Collections.singletonList(queryParam.getDepartment())) + .departmentIds(CollectionUtils.isEmpty(queryParam.getDepartmentIds()) ? null : queryParam.getDepartmentIds()) .salarySendId(queryParam.getSalarySendId()) .mergeCountTax(queryParam.getMergeCountTax()) .positionIds(SalaryEntityUtil.isNullOrEmpty(queryParam.getPosition()) ? null : Collections.singletonList(queryParam.getPosition())) @@ -497,6 +503,12 @@ public class SalaryBillController { detailQueryParam.setCurrent(queryParam.getCurrent()); detailQueryParam.setPageSize(queryParam.getPageSize()); + if (StringUtils.isNotBlank(queryParam.getSubCompanyIdStr())) { + detailQueryParam.setSubCompanyIds(Arrays.asList(StringUtils.split(queryParam.getSubCompanyIdStr(), ",")).stream().map(Long::new).collect(Collectors.toList())); + } + if (StringUtils.isNotBlank(queryParam.getDepartmentIdStr())) { + detailQueryParam.setDepartmentIds(Arrays.asList(StringUtils.split(queryParam.getDepartmentIdStr(), ",")).stream().map(Long::new).collect(Collectors.toList())); + } return new ResponseResult>(user).run(getSalarySendWrapper(user)::detailList, detailQueryParam); } From 18c496c00980ea38a0315edfba3f14550d30727f Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 21 Mar 2024 14:19:36 +0800 Subject: [PATCH 168/169] =?UTF-8?q?=E5=A4=9A=E9=83=A8=E9=97=A8=E5=A4=9A?= =?UTF-8?q?=E5=88=86=E9=83=A8=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalarySendDetailQueryParam.java | 3 ++ .../salary/wrapper/SalarySendWrapper.java | 31 +++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java index 5d375a48d..94fb68c32 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailQueryParam.java @@ -47,6 +47,9 @@ public class SalarySendDetailQueryParam extends BaseQueryParam { // 部门id") private List departmentIds; + // 分部id + private List subCompanyIds; + // 岗位id") private List positionIds; diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index a59e5ec01..39784a675 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -256,8 +256,20 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy taxAgent.setLabel("个税扣缴义务人"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(taxAgent); + // 分部 + SearchConditionItem subCompany = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "subCompanyIdStr", "194"); + subCompany.setColSpan(2); + subCompany.setFieldcol(16); + subCompany.setLabelcol(8); + subCompany.setViewAttr(2); + subCompany.setIsQuickSearch(false); + subCompany.setLabel("分部"); + subCompany.setInputType(""); + subCompany.getBrowserConditionParam().setIsSingle(false); + conditionItems.add(subCompany); + // 部门 - SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIds", "4"); + SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIdStr", "4"); departmentName.setColSpan(2); departmentName.setFieldcol(16); departmentName.setLabelcol(8); @@ -265,6 +277,7 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy departmentName.setIsQuickSearch(false); departmentName.setLabel("部门"); departmentName.setInputType(""); + departmentName.getBrowserConditionParam().setIsSingle(false); conditionItems.add(departmentName); // 岗位 @@ -417,8 +430,21 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy taxAgent.setLabel("个税扣缴义务人"); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(taxAgent); + // 分部 + SearchConditionItem subCompany = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "subCompanyIdStr", "194"); + subCompany.setColSpan(2); + subCompany.setFieldcol(16); + subCompany.setLabelcol(8); + subCompany.setViewAttr(2); + subCompany.setInputType(""); + subCompany.setIsQuickSearch(false); + subCompany.setLabel("分部"); + subCompany.getBrowserConditionParam().setIsSingle(false); + conditionItems.add(subCompany); + + // 部门 - SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "department", "4"); + SearchConditionItem departmentName = conditionFactory.createCondition(ConditionType.BROWSER, 502227, "departmentIdStr", "4"); departmentName.setColSpan(2); departmentName.setFieldcol(16); departmentName.setLabelcol(8); @@ -426,6 +452,7 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy departmentName.setInputType(""); departmentName.setIsQuickSearch(false); departmentName.setLabel("部门"); + departmentName.getBrowserConditionParam().setIsSingle(false); conditionItems.add(departmentName); // 岗位 From 25c2e2f1c165078a97512b933762ca9733410b85 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 22 Mar 2024 15:23:03 +0800 Subject: [PATCH 169/169] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=BB=B4=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/EmployBiz.java | 19 ++++ .../engine/salary/entity/hrm/DeptInfo.java | 2 + .../mapper/datacollection/EmployMapper.java | 33 ++++++ .../mapper/datacollection/EmployMapper.xml | 107 ++++++++++++++++++ .../salary/service/SalaryEmployeeService.java | 16 +++ .../impl/SalaryEmployeeServiceImpl.java | 56 ++++++++- .../impl/TaxAgentManageRangeServiceImpl.java | 47 +++++++- 7 files changed, 273 insertions(+), 7 deletions(-) diff --git a/src/com/engine/salary/biz/EmployBiz.java b/src/com/engine/salary/biz/EmployBiz.java index 3599d68e0..ccfe89ef0 100644 --- a/src/com/engine/salary/biz/EmployBiz.java +++ b/src/com/engine/salary/biz/EmployBiz.java @@ -13,6 +13,7 @@ import weaver.conn.mybatis.MyBatisFactory; import weaver.general.BaseBean; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class EmployBiz extends BaseBean { @@ -115,6 +116,24 @@ public class EmployBiz extends BaseBean { } } + public List listByVirtualParams(List virtualQueryParams) { + if (CollectionUtils.isEmpty(virtualQueryParams)) { + return Collections.emptyList(); + } + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + EmployMapper mapper = sqlSession.getMapper(EmployMapper.class); + List emps = new ArrayList<>(); + List> partition = Lists.partition(virtualQueryParams, 100); + partition.forEach(list->{ + emps.addAll(mapper.listByVirtualParams(list)); + }); + return emps; + } finally { + sqlSession.close(); + } + } + public DataCollectionEmployee getEmployeeById(Long employeeId) { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { diff --git a/src/com/engine/salary/entity/hrm/DeptInfo.java b/src/com/engine/salary/entity/hrm/DeptInfo.java index 12f2f61f9..c9b6876ef 100644 --- a/src/com/engine/salary/entity/hrm/DeptInfo.java +++ b/src/com/engine/salary/entity/hrm/DeptInfo.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.hrm; +import com.engine.salary.annotation.I18n; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,6 +25,7 @@ public class DeptInfo { /** * 名称 */ + @I18n private String name; /** diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java index 4f3aa8ed4..ef8646494 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java @@ -51,6 +51,9 @@ public interface EmployMapper { */ List listByParams(@Param("params") Collection queryParams); + List listByVirtualParams(@Param("params") Collection queryParams); + + /** * 多表，详细信息 * @param employeeId @@ -78,6 +81,15 @@ public interface EmployMapper { */ List getDeptInfoList(@Param("departmentIds") List departmentIds); + + /** + * 虚拟部门（其他组织维度） + * @param virtualDepartmentIds + * @return + */ + List getVirtualDeptInfoList(@Param("virtualDepartmentIds") List virtualDepartmentIds); + + /** * 所以分部 * @param subDepartmentIds @@ -85,6 +97,13 @@ public interface EmployMapper { */ List getSubCompanyInfoList(@Param("subDepartmentIds") List subDepartmentIds); + /** + * 虚拟分部 + * @param virtualSubCompanyIds + * @return + */ + List getVirtualSubCompanyInfoList(@Param("virtualSubCompanyIds") List virtualSubCompanyIds); + List listHrmInfoByIdAndName(@Param("param") HrmQueryParam param); List listExtHrmInfoByIdAndName(@Param("param") HrmQueryParam param); @@ -110,4 +129,18 @@ public interface EmployMapper { * @return */ List listByDismissDate(String dismissDate); + + /** + * 根据虚拟部门获取人员信息 + * @param virtualDepartmentIds + * @return + */ + List listVirtualEmpByVirtualDepIds(@Param("virtualDepartmentIds") List virtualDepartmentIds); + + /** + * 根据虚拟分部获取人员信息 + * @param virtualSubCompanyIds + * @return + */ + List listVirtualEmpByVirtualSubCompanyIds(@Param("virtualSubCompanyIds") List virtualSubCompanyIds); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 29ce5fcbe..2c1f00d16 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -151,6 +151,54 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/service/SalaryEmployeeService.java b/src/com/engine/salary/service/SalaryEmployeeService.java index 16afbb396..11a1b002b 100644 --- a/src/com/engine/salary/service/SalaryEmployeeService.java +++ b/src/com/engine/salary/service/SalaryEmployeeService.java @@ -93,8 +93,12 @@ public interface SalaryEmployeeService { List getDeptInfoList(List departmentIds); + List getVirtualDeptInfoList(List virtualDepartmentIds); + List getSubCompanyInfoList(List subDepartmentIds); + List getVirtualSubCompanyInfoList(List virtualSubDepartmentIds); + List listPositionInfo(List positionIds); List listEmployee(); @@ -134,4 +138,16 @@ public interface SalaryEmployeeService { * @return */ EmployeeInfoExpandDTO getExpandFieldSettings(String module); + + /** + * 根据虚拟部门获取人员信息 + * @param virtualDepartmentIds + */ + List getVirtualEmpByVirtualDepIds(List virtualDepartmentIds); + + /** + * 根据虚拟分部获取人员信息 + * @param virtualSubCompanyIds + */ + List getVirtualEmpByVirtualSubCompanyIds(List virtualSubCompanyIds); } diff --git a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java index 3293bf105..c031ff5d5 100644 --- a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java @@ -19,6 +19,8 @@ import com.engine.salary.entity.salarysob.param.SalarySobRangeEmpQueryParam; import com.engine.salary.entity.salarysob.po.SalarySobRangePO; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; +import com.engine.salary.enums.salarysob.TargetTypeEnum; +import com.engine.salary.mapper.datacollection.EmployMapper; import com.engine.salary.mapper.hrm.ExpandFieldSettingsMapper; import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.service.ExtEmpService; @@ -61,6 +63,10 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee return SqlProxyHandle.getProxy(SalarySysConfMapper.class); } + private EmployMapper getEmployMapper() { + return SqlProxyHandle.getProxy(EmployMapper.class); + } + private ExpandFieldSettingsMapper getExpandFieldSettingsMapper() { return SqlProxyHandle.getProxy(ExpandFieldSettingsMapper.class); @@ -259,14 +265,32 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee @Override public List getDeptInfoList(List departmentIds) { - return employBiz.getDeptInfoList(departmentIds); + return SalaryI18nUtil.i18nList(employBiz.getDeptInfoList(departmentIds)); } + @Override + public List getVirtualDeptInfoList(List virtualDepartmentIds) { + if (CollectionUtils.isEmpty(virtualDepartmentIds)) { + return Collections.emptyList(); + } + return SalaryI18nUtil.i18nList(getEmployMapper().getVirtualDeptInfoList(virtualDepartmentIds)); + } + + @Override public List getSubCompanyInfoList(List subDepartmentIds) { return SalaryI18nUtil.i18nList(employBiz.getSubCompanyInfoList(subDepartmentIds)); } + @Override + public List getVirtualSubCompanyInfoList(List virtualSubDepartmentIds) { + if (CollectionUtils.isEmpty(virtualSubDepartmentIds)) { + return Collections.emptyList(); + } + return SalaryI18nUtil.i18nList(getEmployMapper().getVirtualSubCompanyInfoList(virtualSubDepartmentIds)); + } + + @Override public List listPositionInfo(List positionIds) { return SalaryI18nUtil.i18nList(employBiz.listPositionInfo(positionIds)); @@ -283,10 +307,24 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee @Override public List listByParams(List includeQueryParams) { + if (CollectionUtils.isEmpty(includeQueryParams)) { + return Collections.emptyList(); + } + List result = employBiz.listByParams(includeQueryParams); if (openExtEmp) { result.addAll(getExtEmpService(user).listByParams(includeQueryParams)); } + // 查询虚拟部门、分部人员信息 + List virtualParams = includeQueryParams.stream().filter(param -> + (param.getTargetType().equals(TargetTypeEnum.SUBCOMPANY.name()) || param.getTargetType().equals(TargetTypeEnum.DEPT.name())) && ((List) param.getTargetIds()).get(0).compareTo(0L) < 0 + ).collect(Collectors.toList()); + + result.addAll(employBiz.listByVirtualParams(virtualParams)); + + // 从hrmresource和hrmresourcevirtual可能获取到重复人员数据，需要根据人员id去重 + result = result.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparingLong(DataCollectionEmployee::getEmployeeId))), ArrayList::new)); + return SalaryI18nUtil.i18nList(result); } @@ -428,4 +466,20 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee return null; } + + @Override + public List getVirtualEmpByVirtualDepIds(List virtualDepartmentIds) { + if (CollectionUtils.isEmpty(virtualDepartmentIds)) { + return Collections.emptyList(); + } + return getEmployMapper().listVirtualEmpByVirtualDepIds(virtualDepartmentIds); + } + + @Override + public List getVirtualEmpByVirtualSubCompanyIds(List virtualSubCompanyIds) { + if (CollectionUtils.isEmpty(virtualSubCompanyIds)) { + return Collections.emptyList(); + } + return getEmployMapper().listVirtualEmpByVirtualSubCompanyIds(virtualSubCompanyIds); + } } diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index a3c7fbbaf..e789ea5c2 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -176,8 +176,21 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM if (CollectionUtils.isEmpty(taxAgentManageRanges) || CollectionUtils.isEmpty(salaryEmployees)) { return Collections.emptyList(); } + // 获取虚拟部门下人员信息 + List virtualDepartmentIds = taxAgentManageRanges.stream().filter(manageRange -> manageRange.getTargetType().equals(TargetTypeEnum.DEPT.getValue()) && manageRange.getTargetId().compareTo(0L) < 0) + .map(TaxAgentManageRangePO::getTargetId).collect(Collectors.toList()); + List virtualEmpListByDep = getSalaryEmployeeService(user).getVirtualEmpByVirtualDepIds(virtualDepartmentIds); + Map> virtualDepMap = SalaryEntityUtil.group2Map(virtualEmpListByDep, DataCollectionEmployee::getDepartmentId, DataCollectionEmployee::getEmployeeId); + + // 获取虚拟分部下人员信息 + List virtualSubCompanyIds = taxAgentManageRanges.stream().filter(manageRange -> manageRange.getTargetType().equals(TargetTypeEnum.SUBCOMPANY.getValue()) && manageRange.getTargetId().compareTo(0L) < 0) + .map(TaxAgentManageRangePO::getTargetId).collect(Collectors.toList()); + List virtualEmpListBySubCom = getSalaryEmployeeService(user).getVirtualEmpByVirtualSubCompanyIds(virtualSubCompanyIds); + Map> virtualSubCompanyMap = SalaryEntityUtil.group2Map(virtualEmpListBySubCom, DataCollectionEmployee::getSubcompanyid, DataCollectionEmployee::getEmployeeId); + List salaryEmployeeList = Lists.newArrayList(); for (TaxAgentManageRangePO manageRange : taxAgentManageRanges) { + boolean isVirtual = manageRange.getTargetId().compareTo(0L) < 0 ? true : false; salaryEmployeeList.addAll(salaryEmployees.stream().filter(salaryEmployee -> { if (StringUtils.isEmpty(manageRange.getEmployeeStatus()) || !manageRange.getEmployeeStatus().contains("\"" + salaryEmployee.getStatus() + "\"")) { return false; @@ -188,11 +201,26 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.EMPLOYEE.getValue()) && Objects.equals(manageRange.getTargetId(), salaryEmployee.getEmployeeId())) { return true; } - if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.DEPT.getValue()) && Objects.equals(manageRange.getTargetId(), salaryEmployee.getDepartmentId())) { - return true; - } - if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.SUBCOMPANY.getValue()) && Objects.equals(manageRange.getTargetId(), salaryEmployee.getSubcompanyid())) { - return true; + if (isVirtual) { + if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.DEPT.getValue())) { + Set empIds = virtualDepMap.get(manageRange.getTargetId()); + if (CollectionUtils.isNotEmpty(empIds) && empIds.contains(salaryEmployee.getEmployeeId())) { + return true; + } + } + if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.SUBCOMPANY.getValue())) { + Set empIds = virtualSubCompanyMap.get(manageRange.getTargetId()); + if (CollectionUtils.isNotEmpty(empIds) && empIds.contains(salaryEmployee.getEmployeeId())) { + return true; + } + } + } else { + if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.DEPT.getValue()) && Objects.equals(manageRange.getTargetId(), salaryEmployee.getDepartmentId())) { + return true; + } + if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.SUBCOMPANY.getValue()) && Objects.equals(manageRange.getTargetId(), salaryEmployee.getSubcompanyid())) { + return true; + } } if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.POSITION.getValue()) && Objects.equals(manageRange.getTargetId(), salaryEmployee.getJobtitleId())) { return true; @@ -250,10 +278,17 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM // 查询部门信息 List departmentIds = taxAgentManageRanges.stream().filter(e -> Objects.equals(e.getTargetType(), TargetTypeEnum.DEPT.getValue())).map(TaxAgentManageRangePO::getTargetId).collect(Collectors.toList()); List departmentComInfos = getSalaryEmployeeService().getDeptInfoList(departmentIds); + // 虚拟部门 + List virtualDepIds = departmentIds.stream().filter(id -> id.compareTo(0L) < 0).collect(Collectors.toList()); + departmentComInfos.addAll(getSalaryEmployeeService().getVirtualDeptInfoList(virtualDepIds)); + // 查询分部信息 List subDepartmentIds = taxAgentManageRanges.stream().filter(e -> Objects.equals(e.getTargetType(), TargetTypeEnum.SUBCOMPANY.getValue())).map(TaxAgentManageRangePO::getTargetId).collect(Collectors.toList()); - List subDepartmentComInfos = getSalaryEmployeeService().getSubCompanyInfoList(subDepartmentIds); + // 虚拟分部 + List virtualSubCompanyIds = subDepartmentIds.stream().filter(id -> id.compareTo(0L) < 0).collect(Collectors.toList()); + subDepartmentComInfos.addAll(getSalaryEmployeeService().getVirtualSubCompanyInfoList(virtualSubCompanyIds)); + // 查询岗位信息 List positionIds = taxAgentManageRanges.stream().filter(e -> Objects.equals(e.getTargetType(), TargetTypeEnum.POSITION.getValue())).map(TaxAgentManageRangePO::getTargetId).collect(Collectors.toList()); List positionComInfos = getSalaryEmployeeService().listPositionInfo(positionIds);