diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 4948e64..61f152e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1842,7 +1842,9 @@ public class PatrolResultController extends BaseController { basedataEqpBook.setAlgId(algId); new SimpleDateFormat("yyyyMMdd"); basedataEqpBook.setType(null); - List list = patrolResultService.selectBasedataEqpBookList(basedataEqpBook); +// List list = patrolResultService.selectBasedataEqpBookList(basedataEqpBook); + List list = patrolResultService.selectCamera(basedataEqpBook); + logger.info("--------getEqpBookListInfo new list size:{}!!!!!!", list.size()); ArrayList items; if (null != list && !list.isEmpty()) { items = new ArrayList<>(); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java index 8711fe6..f8ae020 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java @@ -38,6 +38,8 @@ public interface PatrolResultMapper { List selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpBookMoMain); + List selectCamera(BasedataEqpBookMoMain basedataEqpBook); + List selectPatroByAllDev(PatrolResult patrolResult); List selectPatroByAllDevByMainIds(PatrolResult patrolResult); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java index 4b1e01a..ee14a13 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java @@ -34,6 +34,8 @@ public interface IPatrolResultService { List selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpbookMomain); + List selectCamera(BasedataEqpBookMoMain basedataEqpBook); + List selectPatroByAllDev(PatrolResult patrolResult); List selectPatroByAllDevByMainIds(PatrolResult patrolResult); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index b86ea2c..967906d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -155,6 +155,11 @@ public class PatrolResultServiceImpl implements IPatrolResultService { return patrolResultMapper.selectBasedataEqpBookList(patrolResult); } + @Override + public List selectCamera(BasedataEqpBookMoMain basedataEqpBook) { + return patrolResultMapper.selectCamera(basedataEqpBook); + } + public List selectPatroByAllDev(PatrolResult patrolResult) { return patrolResultMapper.selectPatroByAllDev(patrolResult); } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 0f90ef8..d319d34 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -430,6 +430,48 @@ and password = #{password} + + + +