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);