From a976dbc9c5c92d77cbb827b1ee7f7bc4c8e8bae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 29 Jul 2024 09:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=91=98=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/wiki/常用查询.md | 14 ++++- .../salary/enums/auth/TargetTypeEnum.java | 54 ++++++++++++++++--- .../service/auth/AuthMemberServiceImpl.java | 7 ++- 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/resource/wiki/常用查询.md b/resource/wiki/常用查询.md index 13ba2242f..b294488fd 100644 --- a/resource/wiki/常用查询.md +++ b/resource/wiki/常用查询.md @@ -18,4 +18,16 @@ left join hrmresource e on e.id= result.employee_id left join hrsa_tax_agent t on a.tax_agent_id=t.id where a.delete_type=0 and i.delete_type=0 and t.delete_type=0 and c.delete_type=0 and a.employee_id=人员id and t.name=扣缴义务人名称 - c.name='基本工资' order by effective_time desc \ No newline at end of file + c.name='基本工资' order by effective_time desc + + +# 删除系统项目 +UPDATE set hrsa_sys_salary_item where delete_type =3 where delete_type =0; + +update hrsa_salary_sob_default_item set delete_type =3 where delete_type =0; + + +update hrsa_salary_sob_item set delete_type= 3 where delete_type =0 and salary_item_id in (select id from hrsa_salary_item where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal') +); + +UPDATE hrsa_salary_item set delete_type = 3 where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal'); \ No newline at end of file diff --git a/src/com/engine/salary/enums/auth/TargetTypeEnum.java b/src/com/engine/salary/enums/auth/TargetTypeEnum.java index 591c6b5f8..63c36dc09 100644 --- a/src/com/engine/salary/enums/auth/TargetTypeEnum.java +++ b/src/com/engine/salary/enums/auth/TargetTypeEnum.java @@ -1,9 +1,13 @@ package com.engine.salary.enums.auth; +import com.engine.common.service.HrmCommonService; +import com.engine.common.service.impl.HrmCommonServiceImpl; import com.engine.salary.enums.BaseEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; +import weaver.conn.RecordSet; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Set; @@ -20,24 +24,62 @@ import java.util.stream.Collectors; public enum TargetTypeEnum implements BaseEnum { - emp(1, "人员", 87627) { + EMP(1, "人员", 87627) { @Override public List getEmpIds(Set targets) { return targets.stream().map(Long::valueOf).collect(Collectors.toList()); } }, - department(2, "部门", 87626) { + DEPARTMENT(2, "部门", 87626) { @Override public List getEmpIds(Set targets) { List deptIds = targets.stream().map(Long::valueOf).collect(Collectors.toList()); SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); return salaryEmployeeService.listByDepartment(deptIds); } + }, + JOB(3, "岗位", 87626) { + @Override + public List getEmpIds(Set targets) { + List ids = targets.stream().map(Long::valueOf).collect(Collectors.toList()); + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return salaryEmployeeService.listByJob(ids); + } + }, + SUBCOMPANY(4, "分部", 87626) { + @Override + public List getEmpIds(Set targets) { + List ids = targets.stream().map(Long::valueOf).collect(Collectors.toList()); + SalaryEmployeeServiceImpl salaryEmployeeService = new SalaryEmployeeServiceImpl(); + return salaryEmployeeService.listBySubCompany(ids); + } + }, + ROLE(5, "角色", 87626) { + @Override + public List getEmpIds(Set targets) { + HrmCommonService hrmCommonService = new HrmCommonServiceImpl(); + List memberList = new ArrayList<>(); + targets.forEach(roleId -> { + memberList.addAll(hrmCommonService.getRoleMembers(roleId, "2")); + }); + return memberList.stream().map(id -> Long.parseLong(id.toString()) ).collect(Collectors.toList()); + } + }, + SQL(6, "sql", 87626) { + @Override + public List getEmpIds(Set targets) { + List memberList = new ArrayList<>(); + targets.forEach(sql -> { + RecordSet rs = new RecordSet(); + if (rs.execute(sql)) { + while (rs.next()) { + memberList.add(Long.parseLong(rs.getString("id"))); + } + } + }); + return memberList; + } }; -// post(3, "岗位", 87626), -// branch(4, "分部", 87626), -// role(5, "角色", 87626), -// sql(6, "sql", 87626); private Integer value; diff --git a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java index 2e57421e6..e1f23019a 100644 --- a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.salary.service.auth; +import cn.hutool.core.collection.CollUtil; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.hrmelog.entity.dto.LoggerContext; @@ -22,6 +23,7 @@ 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.google.common.collect.Lists; import weaver.hrm.User; import java.util.*; @@ -140,6 +142,9 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) .build()) .collect(Collectors.toList()); - getAuthRoleEmpMapper().batchInsert(roleEmpPOS); + if (CollUtil.isNotEmpty(roleEmpPOS)) { + List> partition = Lists.partition(roleEmpPOS, 100); + partition.forEach(list -> getAuthRoleEmpMapper().batchInsert(list)); + } } }