Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01

src/com/engine/salary/enums/siaccount/EmployeeStatusEnum.java

@@ -2,6 +2,8 @@ package com.engine.salary.enums.siaccount;
 
 import com.engine.salary.enums.BaseEnum;
 
+import java.util.Objects;
+
 
 /**
  * 福利档案人员状态枚举
@@ -45,4 +47,13 @@ public enum EmployeeStatusEnum implements BaseEnum<String> {
     public String getDefaultLabel() {
         return this.defaultLable;
     }
+
+    public static EmployeeStatusEnum parseByValue(String value){
+        for (EmployeeStatusEnum employeeStatusEnum : EmployeeStatusEnum.values()) {
+            if(Objects.equals(employeeStatusEnum.getValue(), value)){
+                return employeeStatusEnum;
+            }
+        }
+        return null;
+    }
 }

src/com/engine/salary/service/impl/SIArchivesServiceImpl.java

@@ -190,18 +190,6 @@ 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.siArchivesLoggerTemplate.write(loggerContext);
         return apidatas;
     }
 
@@ -218,17 +206,6 @@ 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.siArchivesLoggerTemplate.write(loggerContext);
         return apidatas;
     }
 
@@ -296,6 +273,20 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
 //        apidatas = siArchivesBiz.listPage(param, (long) user.getUID());
         apidatas = listPage(param, (long) user.getUID());
 
+        //记录操作日志
+        List<String> runStatuses = param.getRunStatuses() == null ? Collections.emptyList() : param.getRunStatuses().stream().map(s -> EmployeeStatusEnum.parseByValue(s).getDefaultLabel()).collect(Collectors.toList());
+        String runStatusStr = CollectionUtils.isEmpty(runStatuses) ? "" : StringUtils.join(runStatuses, "");
+        if (param.isExtWelArchiveList()) {
+            runStatusStr = "非系统人员";
+        }
+        LoggerContext loggerContext = new LoggerContext<>();
+        loggerContext.setUser(user);
+        loggerContext.setTargetName(runStatusStr);
+        loggerContext.setOperateType(OperateTypeEnum.READ.getValue());
+        loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看福利档案列表"));
+        loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看福利档案列表"));
+        SalaryElogConfig.siArchivesLoggerTemplate.write(loggerContext);
+
         log.info("各操作计时 {}", sw.prettyPrint());
         return apidatas;
     }

src/com/engine/salary/wrapper/SalaryArchiveWrapper.java

@@ -5,6 +5,8 @@ import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 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.DataCollectionEmployee;
 import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveBaseInfoFormDTO;
@@ -17,6 +19,7 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
 import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
 import com.engine.salary.entity.taxagent.dto.TaxAgentListDTO;
 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.salaryarchive.*;
 import com.engine.salary.exception.SalaryRunTimeException;
@@ -166,6 +169,15 @@ public class SalaryArchiveWrapper extends Service {
         datas.put("dataKey", result.getResultMap());
         datas.put("salaryArchives", salaryArchives);
         datas.put("listType", listTypeEnum.getValue());
+
+        //记录操作日志
+        LoggerContext loggerContext = new LoggerContext<>();
+        loggerContext.setUser(user);
+        loggerContext.setTargetName(listTypeEnum.getDefaultLabel());
+        loggerContext.setOperateType(OperateTypeEnum.READ.getValue());
+        loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "查看薪资档案列表"));
+        loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "查看薪资档案列表"));
+        SalaryElogConfig.salaryArchiveLoggerTemplate.write(loggerContext);
         return datas;
     }