Commit 3bd293b6 authored by chenzhao's avatar chenzhao

修改bug

parent b7cd0a18
...@@ -86,8 +86,13 @@ public class FailureDetailsController extends BaseController { ...@@ -86,8 +86,13 @@ public class FailureDetailsController extends BaseController {
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<FailureDetailsDto> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<FailureDetailsDto> selectOne(@PathVariable Long sequenceNbr) {
FailureDetailsDto failureDetailsDto = failureDetailsServiceImpl.queryForOne(sequenceNbr);ReginParams selectedOrgInfo = getSelectedOrgInfo();
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForOne(sequenceNbr)); if (failureDetailsDto.getSubmissionPid().toString().equals(selectedOrgInfo.getUserModel().getUserId())) {
failureDetailsDto.setIsSubmit(true);
}
return ResponseHelper.buildResponse(failureDetailsDto);
} }
/** /**
......
...@@ -174,7 +174,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ ...@@ -174,7 +174,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0"); list = equipmentSpecificAlarmLogService.getIsConfirmByAlarmId(equipmentSpecificAlarmId, "0");
} }
} }
switch ( ent.getType()){ switch ( ent.getConfirmType()){
case "火警": case "火警":
ent.setType("FIREALARM"); ent.setType("FIREALARM");
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