diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index 505c5202a..40caf1737 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/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);
}
// 删除
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 861366312..fb89e1e69 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -323,10 +323,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()));