From 42e91e32da8091e7f09b09664e3a81646d085aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 26 Aug 2024 09:26:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E4=BF=A1=E6=81=AF=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryAcctEmployeeQueryParam.java | 1 - .../salaryacct/SalaryAcctEmployeeMapper.xml | 468 +++--------------- .../salary/web/SalaryAcctController.java | 4 - 3 files changed, 81 insertions(+), 392 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java index 81266c2d3..2d532855e 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java @@ -48,7 +48,6 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam { * 状态 * @see SalaryEmployeeStatusEnum */ - private SalaryEmployeeStatusEnum status; //状态(多选) private List statuses; diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index d0a5e2311..28f8e7779 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -573,13 +573,34 @@ AND t.tax_agent_id = #{param.taxAgentId} + -- 分部 + + AND t.subcompany_id IN + + #{subcompanyId} + + + -- 部门 + + AND t.department_id IN + + #{departmentId} + + + + AND t.jobtitle_id IN + + #{positionId} + + + + AND t.status IN + + #{userStatus} + + + or (param.workcode != null and param.workcode != '')"> AND t.employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -590,68 +611,6 @@ AND em.workcode like CONCAT('%',#{param.workcode},'%') - -- 分部 - - AND em.subcompanyid1 IN - - #{subcompanyId} - - - -- 部门 - - AND em.departmentid IN - - #{departmentId} - - - - AND em.jobtitle IN - - #{positionId} - - - - AND em.status IN - - #{userStatus} - - - -- 在职 - - AND em.status in (0,1,2,3) - - -- 离职(解雇,离职,退休) - - AND em.status in (4,5,6) - - -- 试用 - - AND em.status in (0) - - -- 正式 - - AND em.status in (1) - - -- 临时 - - AND em.status in (2) - - -- 试用延期 - - AND em.status in (3) - - -- 解雇 - - AND em.status in (4) - - -- 离职 - - AND em.status in (5) - - -- 退休 - - AND em.status in (6) - union all @@ -662,68 +621,6 @@ AND extem.workcode like CONCAT('%',#{param.workcode},'%') - -- 分部 - - AND extem.subcompany_id IN - - #{subcompanyId} - - - -- 部门 - - AND extem.department_id IN - - #{departmentId} - - - - AND extem.jobtitle_id IN - - #{positionId} - - - - AND extem.status IN - - #{userStatus} - - - -- 在职 - - AND extem.status in (0,1,2,3) - - -- 离职(解雇,离职,退休) - - AND extem.status in (4,5,6) - - -- 试用 - - AND extem.status in (0) - - -- 正式 - - AND extem.status in (1) - - -- 临时 - - AND extem.status in (2) - - -- 试用延期 - - AND extem.status in (3) - - -- 解雇 - - AND extem.status in (4) - - -- 离职 - - AND extem.status in (5) - - -- 退休 - - AND extem.status in (6) - ) @@ -737,13 +634,34 @@ AND t.tax_agent_id = #{param.taxAgentId} + -- 分部 + + AND t.subcompany_id IN + + #{subcompanyId} + + + -- 部门 + + AND t.department_id IN + + #{departmentId} + + + + AND t.jobtitle_id IN + + #{positionId} + + + + AND t.status IN + + #{userStatus} + + + or (param.workcode != null and param.workcode != '')"> AND t.employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -754,69 +672,7 @@ AND em.workcode like '%'||#{param.workcode}||'%' - - AND em.subcompanyid1 IN - - #{subcompanyId} - - - - AND em.departmentid IN - - #{departmentId} - - - - AND em.jobtitle IN - - #{positionId} - - - - AND em.status IN - - #{userStatus} - - - -- 在职 - - AND em.status in (0,1,2,3) - - -- 离职(解雇,离职,退休) - - AND em.status in (4,5,6) - - -- 试用 - - AND em.status in (0) - - -- 正式 - - AND em.status in (1) - - -- 临时 - - AND em.status in (2) - - -- 试用延期 - - AND em.status in (3) - - -- 解雇 - - AND em.status in (4) - - -- 离职 - - AND em.status in (5) - - -- 退休 - - AND em.status in (6) - - union all - SELECT id FROM hrsa_external_employee extem WHERE extem.status not in (7) AND extem.username LIKE '%'||#{param.employeeName}||'%' @@ -824,66 +680,6 @@ AND extem.workcode like '%'||#{param.workcode}||'%' - - AND extem.subcompany_id IN - - #{subcompanyId} - - - - AND extem.department_id IN - - #{departmentId} - - - - AND extem.jobtitle_id IN - - #{positionId} - - - - AND extem.status IN - - #{userStatus} - - - -- 在职 - - AND extem.status in (0,1,2,3) - - -- 离职(解雇,离职,退休) - - AND extem.status in (4,5,6) - - -- 试用 - - AND extem.status in (0) - - -- 正式 - - AND extem.status in (1) - - -- 临时 - - AND extem.status in (2) - - -- 试用延期 - - AND extem.status in (3) - - -- 解雇 - - AND extem.status in (4) - - -- 离职 - - AND extem.status in (5) - - -- 退休 - - AND extem.status in (6) - ) @@ -897,13 +693,34 @@ AND t.tax_agent_id = #{param.taxAgentId} + -- 分部 + + AND t.subcompany_id IN + + #{subcompanyId} + + + -- 部门 + + AND t.department_id IN + + #{departmentId} + + + + AND t.jobtitle_id IN + + #{positionId} + + + + AND t.status IN + + #{userStatus} + + + or (param.workcode != null and param.workcode != '')"> AND t.employee_id IN ( SELECT id FROM hrmresource em WHERE em.status not in (7) @@ -914,68 +731,6 @@ AND em.workcode like '%'+#{param.workcode}+'%' - - AND em.subcompanyid1 IN - - #{subcompanyId} - - - - AND em.departmentid IN - - #{departmentId} - - - - AND em.jobtitle IN - - #{positionId} - - - - AND em.status IN - - #{userStatus} - - - -- 在职 - - AND em.status in (0,1,2,3) - - - -- 离职(解雇,离职,退休) - - AND em.status in (4,5,6) - - -- 试用 - - AND em.status in (0) - - -- 正式 - - AND em.status in (1) - - -- 临时 - - AND em.status in (2) - - -- 试用延期 - - AND em.status in (3) - - -- 解雇 - - AND em.status in (4) - - -- 离职 - - AND em.status in (5) - - -- 退休 - - AND em.status in (6) - - union all SELECT id FROM hrsa_external_employee extem WHERE extem.status not in (7) @@ -985,67 +740,6 @@ AND extem.workcode like '%'+#{param.workcode}+'%' - - AND extem.subcompany_id IN - - #{subcompanyId} - - - - AND extem.department_id IN - - #{departmentId} - - - - AND extem.jobtitle_id IN - - #{positionId} - - - - AND extem.status IN - - #{userStatus} - - - -- 在职 - - AND extem.status in (0,1,2,3) - - - -- 离职(解雇,离职,退休) - - AND extem.status in (4,5,6) - - -- 试用 - - AND extem.status in (0) - - -- 正式 - - AND extem.status in (1) - - -- 临时 - - AND extem.status in (2) - - -- 试用延期 - - AND extem.status in (3) - - -- 解雇 - - AND extem.status in (4) - - -- 离职 - - AND extem.status in (5) - - -- 退休 - - AND extem.status in (6) - ) diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 48ae48837..571884aa5 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -322,10 +322,6 @@ public class SalaryAcctController { if (StringUtils.isNotBlank(positionIds)) { param.setPositionIds(Arrays.stream(positionIds.split(",")).map(Long::valueOf).collect(Collectors.toList())); } - String status = request.getParameter("status"); - if (StringUtils.isNotBlank(status)) { - param.setStatus(SalaryEmployeeStatusEnum.parseByValue(Integer.parseInt(status))); - } String statuses = request.getParameter("statuses"); if (StringUtils.isNotBlank(statuses)) { param.setStatuses(Arrays.stream(statuses.split(",")).map(String::valueOf).collect(Collectors.toList())); From 05a9b9e9b2b0ce67b6b27af3c39411a45978ccf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 30 Aug 2024 17:23:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=A4=A7=E5=B0=8F?= 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, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java index c595c9139..4c7796174 100644 --- a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java @@ -154,7 +154,7 @@ public class TaxAgentEmpServiceImpl extends Service implements TaxAgentEmpServic // 关联表==================================================== // 新增 if (CollectionUtils.isNotEmpty(taxAgentEmployeeAddList)) { - List> partition = Lists.partition(taxAgentEmployeeAddList, 100); + List> partition = Lists.partition(taxAgentEmployeeAddList, 50); partition.forEach(getTaxAgentEmpMapper()::batchInsert); } // 删除 @@ -250,7 +250,7 @@ public class TaxAgentEmpServiceImpl extends Service implements TaxAgentEmpServic // 关联表==================================================== // 新增 if (CollectionUtils.isNotEmpty(taxAgentEmployeeAddList)) { - List> partition = Lists.partition(taxAgentEmployeeAddList, 100); + List> partition = Lists.partition(taxAgentEmployeeAddList, 50); partition.forEach(getTaxAgentEmpMapper()::batchInsert); } // 删除