Commit 0e747853 authored by tangwei's avatar tangwei

修改bug

parent 3423fc85
...@@ -71,8 +71,9 @@ public class MetaHandler implements MetaObjectHandler { ...@@ -71,8 +71,9 @@ public class MetaHandler implements MetaObjectHandler {
Date currentDate = new Date(); Date currentDate = new Date();
this.setFieldValByName("recDate", currentDate, metaObject); this.setFieldValByName("recDate", currentDate, metaObject);
} }
// if (isExistField("companyCode", entity)) { // if (isExistField("updateTime", entity)) {
// this.setFieldValByName("companyCode", reginParams.getDepartment().getOrgCode(), metaObject); // Date currentDate = new Date();
// this.setFieldValByName("updateTime", currentDate, metaObject);
// } // }
// if (isExistField("companyName", entity)) { // if (isExistField("companyName", entity)) {
// this.setFieldValByName("companyName", reginParams.getDepartment().getDepartmentName(), metaObject); // this.setFieldValByName("companyName", reginParams.getDepartment().getDepartmentName(), metaObject);
......
...@@ -61,4 +61,7 @@ public class AlertCalledZhDto { ...@@ -61,4 +61,7 @@ public class AlertCalledZhDto {
@ApiModelProperty(value = "响应级别字典code 为了过滤用(只有航空器故障有)") @ApiModelProperty(value = "响应级别字典code 为了过滤用(只有航空器故障有)")
private String responseLevelCode; private String responseLevelCode;
@ApiModelProperty(value = "警情修改时间")
private Date updateTime;
} }
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
a.sequence_nbr sequenceNbr, a.sequence_nbr sequenceNbr,
a.alert_stage alertStage, a.alert_stage alertStage,
a.call_time callTime, a.call_time callTime,
a.update_time updateTime,
a.rescue_grid rescueGrid, a.rescue_grid rescueGrid,
CONCAT(a.alert_type,' ',IFNULL((select field_value from jc_alert_form_value where jc_alert_form_value.alert_called_id =a.sequence_nbr and jc_alert_form_value.field_code='remark'),"")) alertType, CONCAT(a.alert_type,' ',IFNULL((select field_value from jc_alert_form_value where jc_alert_form_value.alert_called_id =a.sequence_nbr and jc_alert_form_value.field_code='remark'),"")) alertType,
a.alert_type_code alarmTypeCode, a.alert_type_code alarmTypeCode,
......
...@@ -289,6 +289,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -289,6 +289,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
alertCalled.setAlertStage(AlertStageEnums.JQJB.getValue()); alertCalled.setAlertStage(AlertStageEnums.JQJB.getValue());
alertCalled.setAlarmType(AlertStageEnums.JQGB.getValue()); alertCalled.setAlarmType(AlertStageEnums.JQGB.getValue());
alertCalled.setAlarmTypeCode(AlertStageEnums.JQGB.getCode()); alertCalled.setAlarmTypeCode(AlertStageEnums.JQGB.getCode());
alertCalled.setUpdateTime(new Date());
this.save(alertCalled); this.save(alertCalled);
// 填充警情主键 // 填充警情主键
...@@ -348,16 +349,17 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -348,16 +349,17 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
alertCalledMapper.update(null, alertCalledMapper.update(null,
new UpdateWrapper<AlertCalled>().eq("sequence_nbr", id).set("alert_status", 1) new UpdateWrapper<AlertCalled>().eq("sequence_nbr", id).set("alert_status", 1)
.set("alert_stage", AlertStageEnums.ZBQJ.getValue()) .set("alert_stage", AlertStageEnums.ZBQJ.getValue())
.set("update_time", new Date())
.set("alarm_type", AlertStageEnums.FJQ.getValue()) .set("alarm_type", AlertStageEnums.FJQ.getValue())
.set("alarm_type_code", AlertStageEnums.FJQ.getCode())); .set("alarm_type_code", AlertStageEnums.FJQ.getCode()));
break; break;
case "315": case "315":
alertCalledMapper.update(null, new UpdateWrapper<AlertCalled>().eq("sequence_nbr", id) alertCalledMapper.update(null, new UpdateWrapper<AlertCalled>().eq("sequence_nbr", id)
.set("alert_status", 1).set("alert_stage", AlertStageEnums.CZJS.getValue())); .set("alert_status", 1).set("update_time", new Date()).set("alert_stage", AlertStageEnums.CZJS.getValue()));
break; break;
default: default:
alertCalledMapper.update(null, new UpdateWrapper<AlertCalled>().eq("sequence_nbr", id) alertCalledMapper.update(null, new UpdateWrapper<AlertCalled>().eq("sequence_nbr", id)
.set("alert_stage", AlertStageEnums.CZGZ.getValue())); .set("update_time", new Date()).set("alert_stage", AlertStageEnums.CZGZ.getValue()));
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment