From a7c022f38df7e143310bfd0c6c3b3250243f5b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 16 Aug 2022 10:39:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=94=AF=E6=8C=81oracle=202=E3=80=81?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E3=80=81=E5=BE=80=E6=9C=9F=E8=BF=94=E8=81=98?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/SalaryAcctResultReportMapper.java | 8 ++ .../report/SalaryAcctResultReportMapper.xml | 120 +++++++++++++++++- .../impl/AddUpDeductionServiceImpl.java | 3 + .../impl/AddUpSituationServiceImpl.java | 3 + .../impl/SalaryAcctReportServiceImpl.java | 6 +- 5 files changed, 137 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.java b/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.java index 8ec4e86ae..6a78ae80d 100644 --- a/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.java +++ b/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.java @@ -16,6 +16,14 @@ public interface SalaryAcctResultReportMapper { */ List listSome(SalaryAcctResultReportPO salaryAcctResultReportPO); + /** + * 新增，忽略null字段 + * + * @param salaryAcctResultReport 新增的记录 + * @return 返回影响行数 + */ + int insertIgnoreNull(SalaryAcctResultReportPO salaryAcctResultReport); + /** * 删除记录 diff --git a/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.xml b/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.xml index 69e9aede0..de490172c 100644 --- a/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.xml +++ b/src/com/engine/salary/mapper/report/SalaryAcctResultReportMapper.xml @@ -115,6 +115,124 @@ + + INSERT INTO hrsa_salary_acct_result_report + + + + costcenter_id, + + + create_time, + + + creator, + + + delete_type, + + + department_id, + + + employee_id, + + + id, + + + jobtitle_id, + + + location_id, + + + result_value, + + + salary_acct_emp_id, + + + salary_acct_record_id, + + + salary_item_id, + + + salary_sob_id, + + + subcompany_id, + + + tax_agent_id, + + + tenant_key, + + + update_time, + + + + + #{costcenterId}, + + + #{createTime}, + + + #{creator}, + + + #{deleteType}, + + + #{departmentId}, + + + #{employeeId}, + + + #{id}, + + + #{jobtitleId}, + + + #{locationId}, + + + #{resultValue}, + + + #{salaryAcctEmpId}, + + + #{salaryAcctRecordId}, + + + #{salaryItemId}, + + + #{salarySobId}, + + + #{subcompanyId}, + + + #{taxAgentId}, + + + #{tenantKey}, + + + #{updateTime}, + + + + + UPDATE hrsa_salary_acct_result_report @@ -287,7 +405,7 @@ DELETE FROM hrsa_salary_acct_result_report - WHERE delete_type = 0 + WHERE delete_type = 0 AND salary_acct_emp_id IN #{salaryAcctEmpId} diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index faeeccbd7..a81048c93 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -255,6 +255,9 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction errorMessageMap.put("message", rowIndex + "员工信息不能为空且不可重复(姓名与部门同时确认唯一)"); errorData.add(errorMessageMap); errorSum += 1; + }else{ + Long employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null; + addUpDeduction.setEmployeeId(employeeId); } } else { Long employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null; diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index d24600e38..74d4930d1 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -641,6 +641,9 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation errorMessageMap.put("message", rowIndex + "员工信息不能为空且不可重复(姓名与部门同时确认唯一)"); errorData.add(errorMessageMap); errorSum += 1; + }else { + Long employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null; + po.setEmployeeId(employeeId); } } else { Long employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null; diff --git a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java index 694a4d763..334221f35 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctReportServiceImpl.java @@ -62,8 +62,10 @@ public class SalaryAcctReportServiceImpl extends Service implements SalaryAcctRe public void batchSave(Collection pos) { if (CollectionUtils.isNotEmpty(pos)) { SalaryAcctResultReportPOEncrypt.encryptList(pos); - List> partition = Lists.partition((List) pos, 100); - partition.forEach(getSalaryAcctResultReportMapper()::batchInsert); +// List> partition = Lists.partition((List) pos, 100); +// partition.forEach(getSalaryAcctResultReportMapper()::batchInsert); + + pos.forEach(getSalaryAcctResultReportMapper()::insertIgnoreNull); } }