diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 5721c6c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -27,7 +27,7 @@ List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); - List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId); + List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 5721c6c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -27,7 +27,7 @@ List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); - List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId); + List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c67ac05..07af8c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -99,9 +99,9 @@ } @Override - public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) { + public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId); return alarmJobList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 5721c6c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -27,7 +27,7 @@ List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); - List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId); + List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c67ac05..07af8c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -99,9 +99,9 @@ } @Override - public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) { + public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId); return alarmJobList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 92210b0..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -30,7 +30,7 @@ // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); - List> jobListDelayReApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListDelayReApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); List> jobListDelayPro(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 5721c6c..8b3f54a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -27,7 +27,7 @@ List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); - List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId); + List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index c67ac05..07af8c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -99,9 +99,9 @@ } @Override - public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) { + public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId); return alarmJobList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 92210b0..8a57cae 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -30,7 +30,7 @@ // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); - List> jobListDelayReApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListDelayReApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); List> jobListDelayPro(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index 94f0c9b..5437b1d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -669,6 +669,7 @@ AND aj.JOB_STATUS = '0' AND aj.JOB_FLAG_DELAY = '1' AND ar.ALARM_TYPE = '1' + AND bwi.responsible_dept = #{deptId} and aj.WELL_CODE like