去掉一些打印日志，修改企业微信考勤月度同步时间为每月1号和2号早上6点

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -556,7 +556,6 @@ public class ReportController {
                             reportList.add(report);
                         } else {
                             //批量代填报的
-                            System.out.println("======跨日期批量代填=========");
                             for (User subsUser : targetUserList) {
                                 Report report = new Report()
                                         .setId(id[i] == -1 ? null : id[i])

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

@@ -410,7 +410,6 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 departmentMasterVO.setCostMoney(money);
                 //检查是否有子部门
                 if (allDeptList.stream().anyMatch(dept->department.getDepartmentId().equals(dept.getSuperiorId()))) {
-                    System.out.println("@@@@@@@@有子部门===");
                     departmentMasterVO.setHasSubDept(true);
                 }
                 list.add(departmentMasterVO);

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

@@ -398,16 +398,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     List<ProjectProfession> curPPList = ppList.stream().filter(pp->pp.getProjectId().equals(project.getId())).collect(Collectors.toList());
                     int totalProgress = 0;
                     for (PpMembs memb : curProjectPMList) {
-                        System.out.println("getProgress=="+memb.getProgress()+""+memb.getPercentage());
                         Optional<ProjectProfession> first1 = curPPList.stream().filter(pp -> pp.getProfessionId().equals(memb.getProfessionId())).findFirst();
                         if (first1.isPresent()) {
                             totalProgress += memb.getProgress()*memb.getPercentage()*first1.get().getPercentage();
                         }
-
-                        System.out.println("getProgress==totalProgress="+totalProgress);
                     }
                     totalProgress = totalProgress/100/100;
-                    System.out.println("totalProgress=="+totalProgress);
                     projectVO.setProgress(totalProgress);
                 }
                 list.add(projectVO);

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

@@ -1879,6 +1879,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         TimeType timeType = timeTypeMapper.selectById(company.getId());
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         final List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(reportIds);
+        if (ids.size() == 0) {
+            httpRespMsg.setError("请选择需要审核的日报");
+            return httpRespMsg;
+        }
         if (company.getPackageEngineering() == 1) {
             //检查是否有专业进度待审核
             List<ReportProfessionProgress> list = reportProfessionProgressService.list(new QueryWrapper<ReportProfessionProgress>().in("report_id", ids).eq("audit_state", 0));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -275,8 +275,8 @@ public class TimingTask {
         }
     }
 
-    //每个月2号早上6点同步上个月的企业微信考勤考勤打卡记录
-    @Scheduled(cron = "0 0 6 2 * ?")
+    //每个月1号和2号早上6点同步上个月的企业微信考勤打卡记录
+    @Scheduled(cron = "0 0 6 1,2 * ?")
     private void synMonthCorpWXCardTime() {
         if (isDev) return;
         LocalDateTime lastMonth = LocalDateTime.now().minusMonths(1);

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/CompanyController.java

@@ -93,7 +93,13 @@ public class CompanyController {
             //获取实际活跃人数
             List<User> userCountList = userMapper.selectList(new QueryWrapper<User>().select("company_id, count(1) as department_id").in("company_id", collect).eq("is_active", 1).groupBy("company_id"));
             records.forEach(r->{
-                r.setActiveUserCount(userCountList.stream().filter(u->u.getCompanyId().equals(r.getId())).findFirst().get().getDepartmentId());
+                Optional<User> find = userCountList.stream().filter(u->u.getCompanyId().equals(r.getId())).findFirst();
+                if (find.isPresent()) {
+                    r.setActiveUserCount(find.get().getDepartmentId());
+                } else {
+                    r.setActiveUserCount(0);
+                }
+
             });
         }