diff --git a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java index 84ccc71..1257544 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java @@ -156,6 +156,26 @@ public class AppHotworkController extends BaseController { map.put("result",errInfo); return map; } + /**搜索动火作业动火人及证书编号 + * @param page + * @throws Exception + */ + @RequestMapping(value="/namelist") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "动火作业",instructionsOperate = "动火作业",instructionsType = "动火作业动火人及证书编号") + public Object namelist(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CORPINFO_ID", pd.get("CORPINFO_ID")); //企业ID + page.setPd(pd); + List varList = hotworkService.namelist(pd); //列出PersonnelManagement列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } @RequestMapping("/checkWorkCount") @ResponseBody diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java index 2004d0f..721cc7c 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java @@ -18,6 +18,9 @@ public interface HotworkMapper { void editGasTime(PageData pd); void editStep(PageData pd); List datalistPage(Page page); + + List namelist(PageData pd); + List listAllMeasures(); List checkWorkCount(PageData pd); diff --git a/src/main/java/com/zcloud/service/eightwork/HotworkService.java b/src/main/java/com/zcloud/service/eightwork/HotworkService.java index d02c263..44d8446 100644 --- a/src/main/java/com/zcloud/service/eightwork/HotworkService.java +++ b/src/main/java/com/zcloud/service/eightwork/HotworkService.java @@ -22,6 +22,8 @@ public interface HotworkService { void nextStep(PageData pd, MultipartFile[] files) throws Exception; + public List namelist(PageData pd)throws Exception; + PageData findById(PageData pd) throws Exception; PageData listSignFinished(PageData pd) throws Exception; diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java index 660c4ef..f31475f 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -99,6 +99,10 @@ public class HotworkServiceImpl implements HotworkService { return hotworkMapper.datalistPage(page); } + public List namelist(PageData pd)throws Exception{ + return hotworkMapper.namelist(pd); + } + /* * 下一步 */ diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 349285c..2aac41a 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -481,6 +481,22 @@ + + +