From e129c80e5dcd520c839944a32871348da591917a Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 9 Apr 2024 20:39:05 +0800 Subject: [PATCH] =?UTF-8?q?15050=20=E7=9B=91=E6=8A=A4=E4=BA=BA=E7=AD=BE?= =?UTF-8?q?=E5=AD=97=E5=88=97=E8=A1=A8=20=E5=AD=97=E6=AE=B5=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E6=95=B0=E6=8D=AE?= 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 df7e3489..dc795311 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java @@ -1543,6 +1543,10 @@ public class AppHotworkCfdController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = hotworkCfdService.jhlist(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); @@ -1564,6 +1568,10 @@ public class AppHotworkCfdController extends BaseController { if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); page.setPd(pd); List varList = hotworkCfdService.aqlist(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);