lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

危大工程-技术交底，过程监控

Browse Source
This commit is contained in:
lg
2025-12-06 19:31:19 +08:00
parent 0f1ad34342
commit 6819eb5f80
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/HseJsjdYuJkjcVo.java
View File

@ -15,4 +15,10 @@ public class HseJsjdYuJkjcVo {
* 过程监控文件 * 过程监控文件
*/ */
private String gcjkFile; private String gcjkFile;
/**
* 过程旁站监听文件
*/
private String pzjtFile;
} }

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseDangerArchiveServiceImpl.java
View File

@ -166,18 +166,27 @@ public class HseDangerArchiveServiceImpl extends ServiceImpl<HseDangerArchiveMap
public HseJsjdYuJkjcVo getJsjdYGcjk(Long id) { public HseJsjdYuJkjcVo getJsjdYGcjk(Long id) {
HseJsjdYuJkjcVo hseJsjdYuJkjcVo = new HseJsjdYuJkjcVo(); HseJsjdYuJkjcVo hseJsjdYuJkjcVo = new HseJsjdYuJkjcVo();
if (id == null) throw new RuntimeException("危大工程不能为空"); 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){ if (hseGcjk != null){
hseJsjdYuJkjcVo.setJsjdFile(hseGcjk.getFileId()); 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){ if (hseJsjds != null && hseJsjds.size() != 0){
StringBuffer stringBuffer = new StringBuffer(); StringBuffer stringBuffer = new StringBuffer();
StringBuffer sb = new StringBuffer();
hseJsjds.forEach(hseJsjd -> { 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.setGcjkFile(stringBuffer.toString());
hseJsjdYuJkjcVo.setPzjtFile(sb.toString());
} }
return hseJsjdYuJkjcVo; return hseJsjdYuJkjcVo;