相关bug修改
parent
35c6d2f28e
commit
f8b4d4972a
|
|
@ -40,4 +40,7 @@ public class StFlowRLatestVo {
|
|||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private LocalDateTime tm;
|
||||
|
||||
private BigDecimal lgtd;
|
||||
private BigDecimal lttd;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,6 +74,8 @@ public class StFlowRService extends ServiceImpl<StFlowRMapper, StFlowR> {
|
|||
StFlowRLatestVo vo = new StFlowRLatestVo();
|
||||
vo.setStcd(flowStation.getStcd());
|
||||
vo.setStnm(flowStation.getStnm());
|
||||
vo.setLgtd(flowStation.getLgtd());
|
||||
vo.setLttd(flowStation.getLttd());
|
||||
|
||||
List<StFlowR> list = lambdaQuery()
|
||||
.eq(StFlowR::getStcd, vo.getStcd())
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ public class WarningRuleInfoService extends ServiceImpl<WarningRuleInfoMapper,Wa
|
|||
}
|
||||
info.setFirstAuditStatus(dto.getStatus());
|
||||
info.setFirstAuditTime(LocalDateTime.now());
|
||||
if (info.getSecondAuditUserId() == null){
|
||||
if (info.getSecondAuditUserId() == null || dto.getStatus() == 9){
|
||||
info.setStatus(dto.getStatus());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue