修复日报审核错误

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceServiceImpl.java

@@ -342,12 +342,18 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                         User localUser = new User();
                         localUser.setId(finance.getUserId());
                         localUser.setMonthCost(total);
-                        for (int i=0;i<userTimeList.size(); i++) {
-                            Map<String, Object> map = userTimeList.get(i);
-                            if (map.get("creatorId").equals(finance.getUserId())) {
-                                double time = (Double)map.get("workingTime");
-                                localUser.setCost(total.divide(new BigDecimal(time), 6, BigDecimal.ROUND_HALF_UP));
-                                break;
+                        if (companyId == 936) {
+                            //威派格导入薪资时，按照每月设置的工作天数来计算时薪
+                            BigDecimal db = timeType.getMonthDays().multiply(new BigDecimal(timeType.getAllday()));
+                            localUser.setCost(total.divide(db, 6, BigDecimal.ROUND_HALF_UP));
+                        } else {
+                            for (int i=0;i<userTimeList.size(); i++) {
+                                Map<String, Object> map = userTimeList.get(i);
+                                if (map.get("creatorId").equals(finance.getUserId())) {
+                                    double time = (Double)map.get("workingTime");
+                                    localUser.setCost(total.divide(new BigDecimal(time), 6, BigDecimal.ROUND_HALF_UP));
+                                    break;
+                                }
                             }
                         }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1420,7 +1420,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 if (updateReportList.size() > 0) {
                     updateBatchById(updateReportList);
                     //更新审核人的审批流程
-                    reportAuditorSettingService.updateBatchById(updateReportAuditorSettingList);
+                    if (updateReportAuditorSettingList.size() > 0) {
+                        reportAuditorSettingService.updateBatchById(updateReportAuditorSettingList);
+                    }
                 }
             } else {
                 //之前的流程逻辑，综合了一层项目审核，或者一层任务分组审核。 可叠加部门审批流