日工新增bug修改、薪资生成完善

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<PayDwHoursContrast> 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<PayDwHoursContrast> 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) {//当不是帮工时  直接存员工的部门

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<PayButieVo> 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<PayWorkOrderEmployee> 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<PayBaohuoEmployee> bhEmployees = sgrBaohuoEmployeeMapper.selectSgrBaohuoEmployeeList1(bhEmployee);

ruoyi-pay/src/main/resources/mapper/pay/PayBaohuoEmployeeMapper.xml

@@ -21,6 +21,9 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
     </resultMap>
+    <sql id="selectSgrBaohuoEmployeeVo">
+        select id, wo_id, emp_id, dept_id, emp_name, amount, month, helper, intime from pay_baohuo_employee
+    </sql>
     <select id="selectSgrBaohuoEmployeeList1"  resultMap="PayBaohuoEmployeeResult">
         <include refid="selectSgrBaohuoEmployeeVo"/>
         <where>

ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderEmployeeMapper.xml

@@ -24,6 +24,9 @@
         <result property="helper" column="helper"/>
         <result property="intime" column="intime"/>
     </resultMap>
+    <sql id="selectSgrWorkOrderEmployeeVo">
+        select id, work_order_id, employee_id, dept_id, type, emp_name, start_time, end_time, valid_hours, date, month, processing_type, processing_price, processing_num, amount, helper,intime  from pay_work_order_employee
+    </sql>
     <select id="selectSgrWorkOrderEmployeeList1"  resultMap="PayWorkOrderEmployeeResult">
         <include refid="selectSgrWorkOrderEmployeeVo"/>
         <where>