针对mld 填报及时率排除2024-02-09

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

@@ -8177,6 +8177,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
             }else  sDate = LocalDate.parse(startDate).atTime(LocalTime.MIN);
             List<LocalDateTime> dateTimeList=getDays(sDate, eDate);
+            //针对美莱德 去除2024-02-09
+            if(user.getCompanyId()==876){
+                dateTimeList=dateTimeList.stream().filter(d->d.isEqual(LocalDate.parse(startDate).atTime(LocalTime.MIN))).collect(Collectors.toList());
+            }
             List<Map<String,Object>> dataList=new ArrayList<>();
             long days =dateTimeList.size();
             List<LeaveSheet> leaveSheets = leaveSheetList.stream().filter(ls -> ls.getOwnerId().equals(user.getId())
@@ -8223,12 +8227,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if(leaveSheets.size()>0){
                 for (LeaveSheet leaveSheet : leaveSheets) {
                     List<LocalDateTime> leaveDateList = getDays(leaveSheet.getStartDate().atTime(LocalTime.MIN), leaveSheet.getEndDate().atTime(LocalTime.MIN));
-                    /*if(leaveSheet.getTimeDays()<=1){
-                        days-=1;
-                    }else{
-                        days-=leaveSheet.getTimeDays();
-                    }*/
+                    //针对美莱德 去除2024-02-09
+                    if(user.getCompanyId()==876){
+                        leaveDateList=leaveDateList.stream().filter(d->d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
+                    }
                     List<LocalDateTime> list = getDays(leaveSheet.getStartDate().atTime(LocalTime.now()), leaveSheet.getEndDate().atTime(LocalTime.now()));
+                    //针对美莱德 去除2024-02-09
+                    if(user.getCompanyId()==876){
+                        list=list.stream().filter(d->d.isEqual(LocalDate.parse("2024-02-09").atTime(LocalTime.MIN))).collect(Collectors.toList());
+                    }
                     if(list.size()>1){
                         days-=list.size();
                     }else {
@@ -8267,6 +8274,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //去掉sql返回的毫秒值
                     Timestamp timestamp = (Timestamp) map.get("createTime");
                     LocalDate createDate = LocalDate.parse(String.valueOf(date));
+//                    针对美莱德 去除2024-02-09
+                    if(user.getCompanyId()==876){
+                        if(createDate.isEqual(LocalDate.parse("2024-02-09"))){
+                            continue;
+                        }
+                    }
                     LocalDate createTimeDate =timestamp.toLocalDateTime().toLocalDate();
                     //根据设置
                     switch (timeliness){
@@ -13119,18 +13132,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         row_first.add("");
         row_first.add("");
         row_first.add("");
+        row_first.add("");
         row_first.add("工时耗用率");
         for (int i = 0; i < row_first.size(); i++) {
             SXSSFCell tempCell = row0.createCell(i);
             tempCell.setCellValue(row_first.get(i));
             tempCell.setCellStyle(headStyle);
         }
-        sheet.addMergedRegion(new CellRangeAddress(0,0,4,7));
+        sheet.addMergedRegion(new CellRangeAddress(0,0,4,8));
         sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
         sheet.addMergedRegion(new CellRangeAddress(0,1,1,1));
         sheet.addMergedRegion(new CellRangeAddress(0,1,2,2));
         sheet.addMergedRegion(new CellRangeAddress(0,1,3,3));
-        sheet.addMergedRegion(new CellRangeAddress(0,1,8,8));
+        sheet.addMergedRegion(new CellRangeAddress(0,1,9,9));
         //第二行
         SXSSFRow row1 = sheet.createRow(rowNum++);
         row1.setHeight((short)500);
@@ -13139,6 +13153,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         row_second.add("");
         row_second.add("");
         row_second.add("");
+        row_second.add("增补工时");
         row_second.add("正常工时");
         row_second.add("加班工时");
         row_second.add("合计工时");
@@ -13180,6 +13195,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             }
             list.add(String.valueOf(map.get("groupName")));
             list.add(String.valueOf(map.get("planHour")));
+            list.add(String.valueOf(map.get("afterSetPlanHour")));
             list.add(String.valueOf(map.get("normalHour")));
             list.add(String.valueOf(map.get("overHour")));
             list.add(String.valueOf(map.get("realHour")));
@@ -13190,7 +13206,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         for(int i = 0;i<mapList.size();i++){
             SXSSFRow tempRow = sheet.createRow(rowNum++);
             tempRow.setHeight((short)500);
-            for(int j=0;j<9;j++){
+            for(int j=0;j<10;j++){
                 SXSSFCell tempCell = tempRow.createCell(j);
                 String cellValue = "";
                 tempCell.setCellStyle(cellStyle);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/BeiSenUtils.java

@@ -292,8 +292,8 @@ public class BeiSenUtils {
         headers.add("Authorization","Bearer "+accessToken);
         JSONObject requestMap = new JSONObject();
         requestMap.put("startDate",startDate);
-        List<String> staffIds=new ArrayList<>();
-        staffIds.add(userId);
+        List<Integer> staffIds=new ArrayList<>();
+        staffIds.add(Integer.valueOf(userId));
         requestMap.put("stopDate",endDate);
         requestMap.put("staffIds",staffIds);
         System.out.println("--------headers请求头数据-------"+headers);