From 5ab7c02a97c55025a249c7b535c4e23670ba1a45 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 3 Apr 2024 15:19:59 +0800 Subject: [PATCH] =?UTF-8?q?14906=20=E5=90=8E=E7=BB=AD=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=80=BC=20=E5=8F=82=E8=80=83=E7=94=B3=E8=AF=B7=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=A5=A8=E5=88=97=E8=A1=A8=20=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=83=BD=E8=A6=81=E6=94=B9=20?= =?UTF-8?q?=E6=B3=A8=E6=84=8F=E6=98=AF=E6=89=80=E6=9C=89=E7=9A=84=E5=B0=B1?= =?UTF-8?q?=E4=B8=8D=E5=A4=9A=E6=8F=90BUG=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/highriskwork/AppHotworkCfdController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java index 8c3af136..346da6d4 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1581,6 +1581,10 @@ public class AppHotworkCfdController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = hotworkCfdService.jslist(page); //列出confinedspace列表 + // created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人 + for(PageData dto: varList){ + hotworkCfdService.addInfo(dto); + } map.put("varList", varList); map.put("page", page); map.put("result", errInfo); @@ -1771,6 +1775,10 @@ public class AppHotworkCfdController extends BaseController { PageData request = this.getPageData(); page.setPd(request); List varList = hotworkCfdService.safetyList(page); + // created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人 + for(PageData dto: varList){ + hotworkCfdService.addInfo(dto); + } response.put("varList", varList); response.put("page", page); response.put("result", "success");