diff --git a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java index 69587a87..4b99ab52 100644 --- a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java +++ b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java @@ -194,6 +194,22 @@ public class AppFireRecordController extends BaseController { map.put("varList", res); return map; } + + @RequestMapping("getCheckRecordListV3") + @ResponseBody + public Object getCheckRecordListV3(Page page) { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = getPageData(); + page.setPd(pd); + List res = fireRecordService.getCheckListByAppV3(page); +// List res = fireRecordService.getCheckRecordList(pd); + map.put("result", errInfo); + map.put("page", page); + map.put("varList", res); + return map; + } + /** * @Description: 清单下的检查记录 * @Author: dearLin diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java index cfe481a5..835d5d51 100644 --- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java @@ -89,6 +89,7 @@ public interface FireRecordMapper { List datalistPageV2(Page page); + List datalistPageV3(Page page); List datalistPage(Page page); List getCheckingByCid(String fireCheckId); diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java index 982a1b70..799c900b 100644 --- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java +++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java @@ -80,6 +80,7 @@ public interface FireRecordService { List getCheckListByApp(Page page); List getCheckListByAppV2(Page page); + List getCheckListByAppV3(Page page); List getCheckRecordByPid(PageData pd); /** diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java index 771b1771..45aecea5 100644 --- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java +++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java @@ -723,6 +723,11 @@ public class FireRecordServiceImpl implements FireRecordService { return data; } + @Override + public List getCheckListByAppV3(Page page) { + List data = fireRecordMapper.datalistPageV3(page); + return data; + } @Override public List getCheckRecordByPid(PageData pd) { return fireRecordMapper.getCheckRecordByPid(pd); diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index 29996134..bd0a81ec 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -1031,5 +1031,58 @@ frp.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID} AND frp.ISDELETE = '0' +