diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java index 42e16ce..c70f081 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java @@ -171,7 +171,8 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { //存员工当日工作时间段 if (result > 0) { List sgrDwHoursContrasts = sgrDayWorkHoursQuery.getDwHoursContrasts(); - sgrDwHoursContrasts.parallelStream().forEachOrdered(sgrDwHoursContrast -> { + for(PayDwHoursContrast sgrDwHoursContrast:sgrDwHoursContrasts){ + sgrDwHoursContrast.setId(null); sgrDwHoursContrast.setDwHoursId(payDayWorkHour.getId()); sgrDwHoursContrast.setTenantId(payDayWorkHoursQuery2.getTenantId()); if (sgrDwHoursContrast.getIsHelper() == 0) {//当不是帮工时 直接存员工的部门 @@ -180,7 +181,7 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { } sgrDwHoursContrast.setHours(DateCompareUtil.getDatePoor(sgrDwHoursContrast.getStartTime(),sgrDwHoursContrast.getEndTime())); dwHoursContrastMapper.insert(sgrDwHoursContrast); - }); + }; }else{ return R.ok("系统存储数据库过程中出现故障!"); } @@ -233,7 +234,8 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService { } //重新插入时间段 List sgrDwHoursContrasts = sgrDayWorkHoursQuery.getDwHoursContrasts(); - sgrDwHoursContrasts.parallelStream().forEachOrdered(sgrDwHoursContrast -> { + sgrDwHoursContrasts.stream().forEachOrdered(sgrDwHoursContrast -> { + sgrDwHoursContrast.setId(null); sgrDwHoursContrast.setDwHoursId(payDayWorkHour.getId()); sgrDwHoursContrast.setTenantId(sgrDayWorkHoursQuery.getTenantId()); if (sgrDwHoursContrast.getIsHelper() == 0) {//当不是帮工时 直接存员工的部门 diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PaySalaryReportServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PaySalaryReportServiceImpl.java index bda7a37..a3addbc 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PaySalaryReportServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PaySalaryReportServiceImpl.java @@ -361,6 +361,7 @@ public class PaySalaryReportServiceImpl implements IPaySalaryReportService { //获取所有补贴类型 PayButieBo butiebo = new PayButieBo(); + butiebo.setTenantId(tenantId); List sgrButies = butieService.queryList(butiebo); for (PayEmployeeInfoVo employeeInfo : employeeInfoList) { if (employeeInfo.getPayCalcType() == null) { @@ -375,6 +376,7 @@ public class PaySalaryReportServiceImpl implements IPaySalaryReportService { } PaySalaryReport sgrSalaryReport = new PaySalaryReport(); String empName = employeeInfo.getName(); + sgrSalaryReport.setTenantId(tenantId); sgrSalaryReport.setEmployeeId(employeeInfo.getId()); sgrSalaryReport.setEmployeeName(employeeInfo.getName()); sgrSalaryReport.setYear(year); @@ -465,6 +467,7 @@ public class PaySalaryReportServiceImpl implements IPaySalaryReportService { PayWorkOrderEmployeeBo woEmployee = new PayWorkOrderEmployeeBo(); woEmployee.setEmpName(empName); woEmployee.setIntime(yearMonth); + woEmployee.setTenantId(tenantId); List woEmployees = sgrWorkOrderEmployeeMapper.selectPayWorkOrderEmployeeList1(woEmployee); for (PayWorkOrderEmployee woe : woEmployees) { if (woe.getHelper() == 0) { @@ -476,6 +479,7 @@ public class PaySalaryReportServiceImpl implements IPaySalaryReportService { //包活工资 PayBaohuoEmployeeBo bhEmployee = new PayBaohuoEmployeeBo(); + bhEmployee.setTenantId(tenantId); bhEmployee.setEmpName(empName); bhEmployee.setIntime(yearMonth); List bhEmployees = sgrBaohuoEmployeeMapper.selectSgrBaohuoEmployeeList1(bhEmployee); diff --git a/ruoyi-pay/src/main/resources/mapper/pay/PayBaohuoEmployeeMapper.xml b/ruoyi-pay/src/main/resources/mapper/pay/PayBaohuoEmployeeMapper.xml index 3f80e8f..f8f575c 100644 --- a/ruoyi-pay/src/main/resources/mapper/pay/PayBaohuoEmployeeMapper.xml +++ b/ruoyi-pay/src/main/resources/mapper/pay/PayBaohuoEmployeeMapper.xml @@ -21,6 +21,9 @@ + + select id, wo_id, emp_id, dept_id, emp_name, amount, month, helper, intime from pay_baohuo_employee +