From 7e718472879db358a37d11dcf5d99a88727fb0d0 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 14 Jul 2025 15:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=BC=93=E6=A0=B9=E6=8D=AE=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E8=AE=BE=E5=A4=87=E8=BF=9B=E8=A1=8C=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkerInfoServiceImpl.java   | 92 +++++++++++--------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 907c68abd..cba1221e4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -150,6 +150,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     ISafeEducationQuestionService safeEducationQuestionService;
     @Lazy
     @Autowired
+    IUfaceDevToGroupService ufaceDevToGroupService;
+    @Lazy
+    @Autowired
     private IDictionaryItemService dictionaryItemService;
     @Lazy
     @Autowired
@@ -2175,34 +2178,6 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         return personnelSituation;
     }
 
-    @Override
-    public DeclareAgeVO getDeclareAge(HashMap<String, Object> map) {
-        String projectSn = MapUtils.getString(map, "projectSn");
-        String startDate = MapUtils.getString(map, "startDate");
-        String endDate = MapUtils.getString(map, "endDate");
-        String projectSns = MapUtils.getString(map, "projectSns");
-        if (StringUtils.isNotBlank(projectSn)) {
-            return getDeclareAgeVO(map);
-        }
-        if (StringUtils.isBlank(projectSns)) {
-            throw new OpenAlertException("项目projectSns不能为空");
-        }
-        List<String> snList = new ArrayList<>();
-        String[] snArr = StringUtils.split(projectSns, ",");
-        Collections.addAll(snList, snArr);
-        DeclareAgeVO vo = new DeclareAgeVO();
-        for (String sn : snList) {
-            map.put("projectSn", sn);
-            DeclareAgeVO v1 = getDeclareAgeVO(map);
-            vo.setEighteenToTwentyFour(vo.getEighteenToTwentyFour() + v1.getEighteenToTwentyFour());
-            vo.setTwentyFiveToThirtyFour(vo.getTwentyFiveToThirtyFour() + v1.getTwentyFiveToThirtyFour());
-            vo.setThirtyFiveToFortyNine(vo.getThirtyFiveToFortyNine() + v1.getThirtyFiveToFortyNine());
-            vo.setFiftyToFiftyFive(vo.getFiftyToFiftyFive() + v1.getFiftyToFiftyFive());
-            vo.setNotRegistered(vo.getNotRegistered() + v1.getNotRegistered());
-        }
-        return vo;
-    }
-
     ///*
     //全量和增量更新
     // */
@@ -2252,6 +2227,34 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     //    return JSON.toJSONString(getWorkerInfoByDevVo);
     //}
 
+    @Override
+    public DeclareAgeVO getDeclareAge(HashMap<String, Object> map) {
+        String projectSn = MapUtils.getString(map, "projectSn");
+        String startDate = MapUtils.getString(map, "startDate");
+        String endDate = MapUtils.getString(map, "endDate");
+        String projectSns = MapUtils.getString(map, "projectSns");
+        if (StringUtils.isNotBlank(projectSn)) {
+            return getDeclareAgeVO(map);
+        }
+        if (StringUtils.isBlank(projectSns)) {
+            throw new OpenAlertException("项目projectSns不能为空");
+        }
+        List<String> snList = new ArrayList<>();
+        String[] snArr = StringUtils.split(projectSns, ",");
+        Collections.addAll(snList, snArr);
+        DeclareAgeVO vo = new DeclareAgeVO();
+        for (String sn : snList) {
+            map.put("projectSn", sn);
+            DeclareAgeVO v1 = getDeclareAgeVO(map);
+            vo.setEighteenToTwentyFour(vo.getEighteenToTwentyFour() + v1.getEighteenToTwentyFour());
+            vo.setTwentyFiveToThirtyFour(vo.getTwentyFiveToThirtyFour() + v1.getTwentyFiveToThirtyFour());
+            vo.setThirtyFiveToFortyNine(vo.getThirtyFiveToFortyNine() + v1.getThirtyFiveToFortyNine());
+            vo.setFiftyToFiftyFive(vo.getFiftyToFiftyFive() + v1.getFiftyToFiftyFive());
+            vo.setNotRegistered(vo.getNotRegistered() + v1.getNotRegistered());
+        }
+        return vo;
+    }
+
     @NotNull
     private DeclareAgeVO getDeclareAgeVO(HashMap<String, Object> map) {
         List<String> ageList = workerInfoMapper.getDeclareAge(map);
@@ -2382,17 +2385,28 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
                 .eq(WorkerInfo::getProjectSn, projectSn)
                 .eq(WorkerInfo::getInserviceType, 1)
         );
-//        workerInfos = workerInfos.stream().filter(workerInfo -> {
-//            Integer devType = workerInfo.getDevType();
-//            if (Objects.equals(devType, 1)) {
-//                if (workerInfo.getUfaceDevId() != null) {
-//                    return workerInfo.getUfaceDevId().contains(dev.getId() + "");
-//                } else {
-//                    return false;
-//                }
-//            }
-//            return true;
-//        }).collect(Collectors.toList());
+        List<Long> groupIds = ufaceDevToGroupService.list(new LambdaQueryWrapper<UfaceDevToGroup>()
+                .eq(UfaceDevToGroup::getUfaceDevId, dev.getId())
+        ).stream().map(UfaceDevToGroup::getUfaceDevGroupId).collect(Collectors.toList());
+        workerInfos = workerInfos.stream().filter(workerInfo -> {
+            if (NumberUtils.lt(workerInfo.getSafeScore(), PropertiesUtil.getWorkerInfoRedScore())) {
+                return false;
+            }
+            Integer devType = workerInfo.getDevType();
+            if (Objects.equals(devType, 1)) {
+                if (workerInfo.getUfaceDevId() != null) {
+                    return workerInfo.getUfaceDevId().contains(dev.getId() + "");
+                } else {
+                    return false;
+                }
+            } else {
+                if (workerInfo.getUfaceDevGroupId() != null) {
+                    return StrUtil.split(workerInfo.getUfaceDevGroupId(), ",").stream().anyMatch(wgid -> groupIds.contains(Convert.toLong(wgid)));
+                } else {
+                    return false;
+                }
+            }
+        }).collect(Collectors.toList());
 
         //添加人员
         ArrayList<GetWorkerInfoByDevVo.Worker> datas = new ArrayList<>();