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().eq(HseGcjk::getMasterId, id)); + //技术交底 + HseJsjd hseGcjk = hseJsjdService.getBaseMapper().selectOne(new LambdaQueryWrapper().eq(org.dromara.safety.jsjd.domain.HseJsjd::getMasterId, id)); if (hseGcjk != null){ hseJsjdYuJkjcVo.setJsjdFile(hseGcjk.getFileId()); } - List hseJsjds = hseJsjdService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(HseJsjd::getMasterId, id)); + //过程监控 + List hseJsjds = hseGcjkService.getBaseMapper().selectList(new LambdaQueryWrapper().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;