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 07af8c9..4e9d17c 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 @@ -224,8 +224,7 @@ @Override public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { - return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); -// return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); + return this.baseMapper.overJob(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); } @Override 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 07af8c9..4e9d17c 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 @@ -224,8 +224,7 @@ @Override public boolean overJob(Long id, long personId, String handleMessage, String handlePhotos) { - return this.baseMapper.overJobAndAlarm(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); -// return this.baseMapper.overJob(id, personId,handleMessage, handlePhotos); + return this.baseMapper.overJob(id, personId, handleMessage, handlePhotos) && this.baseMapper.overJobAlarmRecrds(id); } @Override 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 da9c030..30c41a1 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 @@ -1080,30 +1080,18 @@ - update alarm_job set job_status = 3, + update alarm_job + set job_status = 3, handle_job_person = #{personId}, handle_job_time = now(), - handle_message = #{handleMessage}, handle_photos = #{handlePhotos} where id = #{id} - - - UPDATE alarm_job aj, alarm_records ar - set aj.job_status = 3 ,aj.handle_job_person = #{personId}, - aj.handle_job_time = now(),aj.handle_message = #{handleMessage}, - aj.handle_photos = #{handlePhotos},ar.status = 2 - WHERE aj.ID = ar.job_id - AND aj.ID = #{id} - - - UPDATE alarm_records - set ar.status = 2 + set status = 2 WHERE job_id=#{id}