1.返回字段

2.添加判断
main
862857010@qq.com 2 years ago
parent bb58cb8e52
commit 5d5bbaa964
  1. 2
      cjy-project/src/main/java/com/cjy/emergencycommand/controller/AcceptAlarmController.java
  2. 10
      cjy-project/src/main/java/com/cjy/emergencycommand/domain/vo/AcceptAlarmVO.java
  3. 2
      cjy-project/src/main/resources/mapper/emergencycommand/AlarmInfoMapper.xml

@ -45,7 +45,7 @@ public class AcceptAlarmController extends BaseController {
*/
@PostMapping("/createAlarmOrder")
public AjaxResult createAlarmOrder(@RequestBody AlarmInfo alarmInfo) {
if(alarmInfo.getCreateBy().isEmpty()){
if(alarmInfo.getCreateBy() ==null){
alarmInfo.setCreateBy(String.valueOf(getUserId()));
}

@ -74,7 +74,7 @@ public class AcceptAlarmVO {
@Excel(name = "描述")
private String description;
private String status;
private String createBy;
private String classificationDataCode;
@Override
@ -197,4 +197,12 @@ public class AcceptAlarmVO {
public void setClassificationDataCode(String classificationDataCode) {
this.classificationDataCode = classificationDataCode;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
}

@ -403,7 +403,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select t1.id, t1.create_time as createTime ,t2.name as alarmSourceName,
t1.alarm_code as alarmCode,t4.dict_label as gradeName,t3.name as classificationDataName,t1.classification_data_code as classificationDataCode,
t1.contact_user as contactUser,t1.phone as phone,
t1.title,t1.longitude,t1.latitude,t1.status,t1.description
t1.title,t1.longitude,t1.latitude,t1.status,t1.description,t1.create_by as createBy
from ec_alarm_info t1
LEFT JOIN ec_classification_config t2 ON t1.alarm_source = t2.code AND t2.type = 3
LEFT JOIN ec_classification_data_config t3 ON t1.classification_data_code = t3.code

Loading…
Cancel
Save