Commit c4436854 authored by caotao's avatar caotao

当告警id为空时增加判断

parent ff9038aa
......@@ -33,12 +33,12 @@
#{item}
</foreach>
</if>
<if test="param.listHandlerStatus!=null">
AND handler_status IN
<foreach collection="param.listHandlerStatus" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- <if test="param.listHandlerStatus!=null">-->
<!-- AND handler_status IN-->
<!-- <foreach collection="param.listHandlerStatus" item="item" index="index" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
</where>
order by start_time DESC
......
......@@ -292,6 +292,9 @@ public class TdHygfJpInverterWarnController extends BaseController {
result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content,handlerStatus));
List<Long> waringIds = maps.stream().map(tdHygfJpInverterWarnDto -> tdHygfJpInverterWarnDto.getCreatedTime()).collect(Collectors.toList());
if(waringIds.size()>0){
waringIds =Arrays.asList(0L);
}
List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().in("warning_id",waringIds));
maps.forEach(tdHygfJpInverterWarnDto -> {
Set<String> status = hygfMaintenanceTicketsList.stream().filter(hygfmaintenanceTickets -> tdHygfJpInverterWarnDto.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
......
......@@ -90,6 +90,9 @@ public class TdHygfJpInverterWarnServiceImpl
}
}
List<Long> waringIds = list.stream().map(tdHygfJpInverterWarnDto1 -> tdHygfJpInverterWarnDto1.getCreatedTime()).collect(Collectors.toList());
if(waringIds.size()>0){
waringIds =Arrays.asList(0L);
}
List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().in("warning_id",waringIds));
Set<String> status = hygfMaintenanceTicketsList.stream().filter(hygfmaintenanceTickets -> tdHygfJpInverterWarnDto.getCreatedTime().equals(hygfmaintenanceTickets.getWarningId())).map(HYGFMaintenanceTickets::getHandlerStatus).collect(Collectors.toSet());
if(status.contains("未处理")){
......
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