@@ -7,3 +7,15 @@ ALTER TABLE sys_dept DROP note; | |||
-- 修改部门表结束 | |||
-- 机场日志表修改开始 | |||
ALTER TABLE airport_log CHANGE aid airport_id int COMMENT '机场ID'; | |||
ALTER TABLE airport_log DROP COLUMN msg; | |||
ALTER TABLE airport_log CHANGE aname airport_name VARCHAR(255) COMMENT '机场名称'; | |||
ALTER TABLE airport_log CHANGE platformcode platform_code VARCHAR(255) COMMENT '业务平台代码'; | |||
ALTER TABLE airport_log CHANGE platformName platform_name VARCHAR(255) COMMENT '业务平台名称'; | |||
ALTER TABLE airport_log CHANGE taskid inspection_id VARCHAR(255) COMMENT '所属任务id'; | |||
ALTER TABLE airport_log CHANGE task_name inspection_name VARCHAR(255) COMMENT '所属任务名称'; | |||
ALTER TABLE airport_log CHANGE recordid record_id VARCHAR(255) COMMENT '所属任务记录id'; | |||
ALTER TABLE airport_log ADD COLUMN record_name VARCHAR(255) COMMENT '所属任务记录名称'; | |||
-- 机场日志表修改结束 | |||
@@ -44,12 +44,12 @@ public class AlarmLogController extends BaseController { | |||
/** | |||
* 导出Excel | |||
* | |||
* @param registerInformationQuery 查询参数 | |||
* @param alarmLogQuery 查询参数 | |||
* @return | |||
*/ | |||
@GetMapping("/exportExcel") | |||
public JsonResult exportExcel(@Valid AlarmLogQuery registerInformationQuery) { | |||
JsonResult<IPage<AlarmLogVo>> iPageJsonResult = alarmLogService.queryAlarmLog(registerInformationQuery); | |||
public JsonResult exportExcel(@Valid AlarmLogQuery alarmLogQuery) { | |||
JsonResult<IPage<AlarmLogVo>> iPageJsonResult = alarmLogService.queryAlarmLog(alarmLogQuery); | |||
if(ObjectUtil.isEmpty(iPageJsonResult) || iPageJsonResult.getCode() != JsonResult.SUCCESS || ObjectUtil.isEmpty(iPageJsonResult.getData())){ | |||
return JsonResult.error("未查询到数据,请确认查询条件!"); | |||
} |
@@ -1,7 +1,5 @@ | |||
package com.tuoheng.admin.pojo.vo; | |||
import com.baomidou.mybatisplus.annotation.FieldFill; | |||
import com.baomidou.mybatisplus.annotation.TableField; | |||
import com.fasterxml.jackson.annotation.JsonFormat; | |||
import com.tuoheng.common.annotation.Excel; | |||
import lombok.Data; |