From 6819eb5f8018685bf71914a24121e764d7244bef Mon Sep 17 00:00:00 2001
From: lg <lg@163.com>
Date: Sat, 6 Dec 2025 19:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E5=A4=A7=E5=B7=A5=E7=A8=8B-=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E4=BA=A4=E5=BA=95=EF=BC=8C=E8=BF=87=E7=A8=8B=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/safety/domain/vo/HseJsjdYuJkjcVo.java |  6 ++++++
 .../service/impl/HseDangerArchiveServiceImpl.java | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseJsjdYuJkjcVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseJsjdYuJkjcVo.java
index 20e917e2..3678827f 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseJsjdYuJkjcVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseJsjdYuJkjcVo.java
@@ -15,4 +15,10 @@ public class HseJsjdYuJkjcVo {
      * 过程监控文件
      */
     private String gcjkFile;
+
+
+    /**
+     * 过程旁站监听文件
+     */
+    private String pzjtFile;
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java
index cb7e5e91..ef16c3f4 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java
@@ -166,18 +166,27 @@ public class HseDangerArchiveServiceImpl extends ServiceImpl<HseDangerArchiveMap
     public HseJsjdYuJkjcVo getJsjdYGcjk(Long id) {
         HseJsjdYuJkjcVo hseJsjdYuJkjcVo = new HseJsjdYuJkjcVo();
         if (id == null) throw new RuntimeException("危大工程不能为空");
-        HseGcjk hseGcjk = hseGcjkService.getBaseMapper().selectOne(new LambdaQueryWrapper<HseGcjk>().eq(HseGcjk::getMasterId, id));
+        //技术交底
+         HseJsjd hseGcjk = hseJsjdService.getBaseMapper().selectOne(new LambdaQueryWrapper<HseJsjd>().eq(org.dromara.safety.jsjd.domain.HseJsjd::getMasterId, id));
         if (hseGcjk != null){
             hseJsjdYuJkjcVo.setJsjdFile(hseGcjk.getFileId());
         }
 
-        List<HseJsjd> hseJsjds = hseJsjdService.getBaseMapper().selectList(new LambdaQueryWrapper<HseJsjd>().eq(HseJsjd::getMasterId, id));
+        //过程监控
+        List<HseGcjk> hseJsjds = hseGcjkService.getBaseMapper().selectList(new LambdaQueryWrapper<HseGcjk>().eq(HseGcjk::getMasterId, id));
         if (hseJsjds != null && hseJsjds.size() != 0){
             StringBuffer stringBuffer = new StringBuffer();
+            StringBuffer sb = new StringBuffer();
             hseJsjds.forEach(hseJsjd -> {
-                stringBuffer.append(hseJsjd.getFileId()).append(",");
+                if (hseJsjd.getIsOnSiteSupervision().equals("1") && hseJsjd.getSupervisionJl() != null) {
+                    sb.append(hseJsjd.getSupervisionJl()).append(",");
+                }
+                if (hseJsjd.getFileId() != null) {
+                    stringBuffer.append(hseJsjd.getFileId()).append(",");
+                }
             });
             hseJsjdYuJkjcVo.setGcjkFile(stringBuffer.toString());
+            hseJsjdYuJkjcVo.setPzjtFile(sb.toString());
         }
 
         return hseJsjdYuJkjcVo;