停用人员不生成请假日报；选择了带车间的分组时工单号必填

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

@@ -1561,6 +1561,18 @@ public class ReportController {
         }
         //针对泓浒（苏州），需要按照工单号的部门来设置工时所属部门，同时设置是否是协作工时
         if (Constant.HONG_HU_COMPANY_ID == company.getId()) {
+            for (Report report : reportList) {
+                //校验分组为车间的分组时，工单号是否必填
+                if (report.getGroupId() != null) {
+                    String groupName = taskGroupService.getById(report.getGroupId()).getName();
+                    if (groupName.contains("车间") && StringUtils.isEmpty(report.getExtraField4())) {
+                        HttpRespMsg httpRespMsg = new HttpRespMsg();
+                        httpRespMsg.setError("当前选择了带车间的工时分组，对应的工单号必填");
+                        return httpRespMsg;
+                    }
+                }
+            }
+
             List<String> collect = reportList.stream().filter(r -> !StringUtils.isEmpty(r.getExtraField4())).map(Report::getExtraField4).collect(Collectors.toList());
             if (collect.size() > 0) {
                 List<ErpOrderInfo> orderList = erpOrderInfoMapper.selectList(new QueryWrapper<ErpOrderInfo>().in("order_id", collect));

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

@@ -446,6 +446,10 @@ public class DataCollectTask {
                                     //获取某人每天请假的时长合计
                                     String ownerId = tmp.getOwnerId();
                                     User owner = userMapper.selectById(ownerId);
+                                    //停用的用户不生成日报
+                                    if (owner.getIsActive() == 0) {
+                                        continue;
+                                    }
                                     Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("project_code", "HH-GG-0000001").eq("company_id", specialCompanyId));
                                     TaskGroup leaveGroup = taskGroupMapper.selectOne(new LambdaQueryWrapper<TaskGroup>().eq(TaskGroup::getProjectId, project.getId()).eq(TaskGroup::getName, "请假工时"));
                                     for (LocalDate date = tmp.getStartDate(); date.compareTo(tmp.getEndDate()) <= 0; date = date.plusDays(1)) {