Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -4691,16 +4691,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //根据设置
                     switch (timeliness){
                         case 1:createDate=createDate.plusDays(1);
+                                while(!WorkDayCalculateUtils.isWorkDay(createDate)){
+                                    createDate=createDate.plusDays(1);
+                                }
                         break;
-                        case 2:createDate=createDate.plusDays(2);
+                        case 2:
+                            Integer a=0;
+                            while(a!=2){
+                                createDate=createDate.plusDays(1);
+                                if(WorkDayCalculateUtils.isWorkDay(createDate)){
+                                    a++;
+                                }
+                            }
                         break;
                     }
                     if(createTimeDate.isBefore(createDate)||createTimeDate.isEqual(createDate)){
                         num++;
                     }
                 }
-                System.out.println(days);
-                System.out.println(num);
                 BigDecimal bigDecimal=new BigDecimal(num);
                 BigDecimal divide;
                 if(days!=0){

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

@@ -591,17 +591,20 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 } else {
                     if (r.getGroupId() != null && r.getGroupId() != 0) {
                         //直接获取分组的负责人作为审核人
-                        TaskGroup curGroup = taskGroups.stream().filter(tg->tg.getId().equals(r.getGroupId())).findFirst().get();
-                        if (curGroup.getInchargerId() != null) {
-                            User user = userMapper.selectById(curGroup.getInchargerId());
-                            HashMap map = new HashMap();
-                            map.put("auditorId", user.getId());
-                            map.put("auditorName", user.getName());
-                            List list = new ArrayList();
-                            list.add(map);
-                            r.setAuditUserList(list);
-                            if (r.getProjectAuditorId() != null) {
-                                r.setProjectAuditorName(user.selectById(r.getProjectAuditorId()).getName());
+                        Optional<TaskGroup> tgoup = taskGroups.stream().filter(tg->tg.getId().equals(r.getGroupId())).findFirst();
+                        if (tgoup.isPresent()) {
+                            TaskGroup curGroup = tgoup.get();
+                            if (curGroup.getInchargerId() != null) {
+                                User user = userMapper.selectById(curGroup.getInchargerId());
+                                HashMap map = new HashMap();
+                                map.put("auditorId", user.getId());
+                                map.put("auditorName", user.getName());
+                                List list = new ArrayList();
+                                list.add(map);
+                                r.setAuditUserList(list);
+                                if (r.getProjectAuditorId() != null) {
+                                    r.setProjectAuditorName(user.selectById(r.getProjectAuditorId()).getName());
+                                }
                             }
                         }
                     }