Compare commits
No commits in common. "1881570348fff78ae00e7c44fba9da07a8b7b30c" and "2e41503d3b90f6dc8f60f8a87026fd0670cc77d4" have entirely different histories.
1881570348
...
2e41503d3b
|
@ -13,7 +13,6 @@ import java.util.Map;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.zcloud.aspect.DockAnnotation;
|
import com.zcloud.aspect.DockAnnotation;
|
||||||
import com.zcloud.service.highriskwork.HotWorkApplicationService;
|
|
||||||
import com.zcloud.util.*;
|
import com.zcloud.util.*;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
|
@ -44,8 +43,6 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private HotWorkApplicationDelayedService hotworkapplicationdelayedService;
|
private HotWorkApplicationDelayedService hotworkapplicationdelayedService;
|
||||||
@Autowired
|
|
||||||
private HotWorkApplicationService hotWorkApplicationService;
|
|
||||||
|
|
||||||
/**新增
|
/**新增
|
||||||
* @param
|
* @param
|
||||||
|
@ -181,9 +178,6 @@ public class AppHotWorkApplicationDelayedController extends BaseController {
|
||||||
PageData pd = new PageData();
|
PageData pd = new PageData();
|
||||||
pd = this.getPageData();
|
pd = this.getPageData();
|
||||||
List<PageData> varList = hotworkapplicationdelayedService.listAll(pd); //列出HotWorkApplicationDelayed列表
|
List<PageData> varList = hotworkapplicationdelayedService.listAll(pd); //列出HotWorkApplicationDelayed列表
|
||||||
// 获取动火作业的作业开始和结束时间
|
|
||||||
PageData data = hotWorkApplicationService.findById(pd);
|
|
||||||
map.put("data", data);
|
|
||||||
map.put("varList", varList);
|
map.put("varList", varList);
|
||||||
map.put("page", page);
|
map.put("page", page);
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
|
|
Loading…
Reference in New Issue