guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0205cmt' into 0205cmt

0927cmt
zhaoyu 2024-06-06 09:44:15 +08:00
parent ebfdb42b8f 1881570348
commit 164f5feea3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java
View File

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