diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index 28789e86..c104c99f 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -522,6 +522,26 @@ public class OutSourcedController extends BaseController { return map; } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/listForCount") + @ResponseBody + public Object listForCount() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = outsourcedService.listForCount(pd); //列出OutSourced列表 + + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + /** * 去修改页面获取数据 * diff --git a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java index 931dc169..063dfe83 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java @@ -90,5 +90,6 @@ public interface OutSourcedMapper{ List outSouceslistPage(Page page); + List listForCount(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java index e575f688..663b85fb 100644 --- a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java +++ b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java @@ -92,5 +92,6 @@ public interface OutSourcedService{ public List outSouceslistPage(Page page)throws Exception; + List listForCount(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java index a4e51674..9516a978 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java @@ -116,5 +116,10 @@ public class OutSourcedServiceImpl implements OutSourcedService { public List outSouceslistPage(Page page) throws Exception { return outsourcedMapper.outSouceslistPage(page); } + + @Override + public List listForCount(PageData pd) { + return outsourcedMapper.listForCount(pd); + } } diff --git a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml index d1b0af87..f266ca86 100644 --- a/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml +++ b/src/main/resources/mybatis/datasource/map/MapKeyProjectMapper.xml @@ -164,13 +164,15 @@ f.LONGITUDE, o.OUTSOURCED_NAME, c.CORP_NAME, - pv.INDEXCODE + pv.INDEXCODE, + if(vr.ONLINE_STATUS is null,'未上线',if(vr.ONLINE_STATUS = '1','离线','在线')) ONLINE_STATUS from `qa-gwj-regulatory`.BUS_VIDEOMANAGER f LEFT JOIN `qa-gwj-regulatory`.bus_outsourced o on o.OUTSOURCED_ID = f.OUTSOURCED_ID LEFT JOIN `qa-gwj-prevention`.vi_user_all u on o.CREATOR = u.USER_ID LEFT JOIN `qa-gwj-prevention`.bus_corp_info c on u.CORPINFO_ID=c.CORPINFO_ID left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID + left join `qa-gwj-regulatory`.bus_video_resources vr on vr.VIDEO_RESOURCES_ID = f.VIDEO_RESOURCES_ID and vr.ISDELETE = '0' where f.VIDEOMANAGER_ID = #{id} diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 56e96123..557ab56c 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -917,4 +917,15 @@ f.STATE, f.OPERATTIME DESC + +