代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -272,7 +272,12 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        }
        emergencyOrderVO.setUpdateTime(orderDO.getUpdateTime());
        if (orderDO.getStatus()==-1){//已取消
            emergencyOrderVO.setUpdateTime(orderDO.getCancelTime());
            if (orderDO.getCancelTime()!=null){
                emergencyOrderVO.setUpdateTime(orderDO.getCancelTime());
            }
            else {
                emergencyOrderVO.setUpdateTime(orderDO.getUpdateTime());
            }
        }
        //小结
        Integer conclusionStatus = Integer.valueOf(orderDO.getConclusionStatus()==null?"0":(orderDO.getConclusionStatus()+""));