diff --git a/cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml b/cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml index 060308f5..386f7f79 100644 --- a/cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml +++ b/cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml @@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dict_data t8 ON t1.status = t8.dict_value AND t8.dict_type = 'alarm_status' LEFT JOIN sys_dict_data t7 ON t1.grade_id = t7.dict_value AND t7.dict_type = 'urgency_grade' - t1.del_flag !=2 + t1.del_flag !=2 and t1.status>1 and t1.status=#{status} AND t1.alarm_code like concat('%',#{alarmInfoKeyWord},'%') or t1.title like diff --git a/doc/应急指挥/~$指挥前台接口文档.docx b/doc/应急指挥/~$指挥前台接口文档.docx new file mode 100644 index 00000000..1aeebb1f Binary files /dev/null and b/doc/应急指挥/~$指挥前台接口文档.docx differ diff --git a/doc/应急指挥/应急智慧管理模块接口文档2.0.docx b/doc/应急指挥/应急智慧管理模块接口文档2.0.docx index 1ef7a430..5c41d4bb 100644 Binary files a/doc/应急指挥/应急智慧管理模块接口文档2.0.docx and b/doc/应急指挥/应急智慧管理模块接口文档2.0.docx differ