From 9909333a2c645e4f110ad95f1534cbfef042bda4 Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Wed, 5 Jun 2024 16:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BB=B6=E6=97=B6=E5=8A=A8?= =?UTF-8?q?=E7=81=AB=E7=82=B9=E5=87=BB=E5=AE=8C=E6=88=90=E5=BB=B6=E6=97=B6?= =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=97=A0=E5=93=8D=E5=BA=94=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppHotWorkApplicationDelayedController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java index 0fadaf7a..a30a9f36 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java @@ -13,6 +13,7 @@ import java.util.Map; import com.alibaba.fastjson.JSON; import com.zcloud.aspect.DockAnnotation; +import com.zcloud.service.highriskwork.HotWorkApplicationService; import com.zcloud.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -43,6 +44,8 @@ public class AppHotWorkApplicationDelayedController extends BaseController { @Autowired private HotWorkApplicationDelayedService hotworkapplicationdelayedService; + @Autowired + private HotWorkApplicationService hotWorkApplicationService; /**新增 * @param @@ -178,6 +181,9 @@ public class AppHotWorkApplicationDelayedController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); List varList = hotworkapplicationdelayedService.listAll(pd); //列出HotWorkApplicationDelayed列表 + // 获取动火作业的作业开始和结束时间 + PageData data = hotWorkApplicationService.findById(pd); + map.put("data", data); map.put("varList", varList); map.put("page", page); map.put("result", errInfo);