GetDynamicByEventType排查修复

wx

2022-11-19 2cb660355ca04071d1837d484dbdcf17bdeff9ca

GetDynamicByEventType排查修复

 RiskControl.NewService/Service/AlarmService.cs

@@ -273,16 +273,17 @@
                "深度信息-经营信息-专利信息"
            };
            var anTypeArr = new[] { "深度信息-上市信息-公司公告-业绩预告", "深度信息-上市信息-公司公告-公司公告", "深度信息-新三板上市信息-公司公告" };
            var orWhere = Expressionable.Create<ComDynamic>();
            orWhere.AndIF(eventType1.Contains("经营预警类"), a => a.EventType.StartsWith("深度信息-经营预警"))
                .OrIF(eventType1.Contains("司法涉诉类"), a => a.EventType.StartsWith("深度信息-司法涉诉"))
                .OrIF(eventType1.Contains("租赁融资类"), a => rateTypeArr.Contains(a.EventType))
                .OrIF(eventType1 == "新闻类", a => newsTypeArr.Contains(a.EventType))
                .OrIF(eventType1 == "公告类", a => anTypeArr.Contains(a.EventType));
            var result = alarmDb.Queryable<ComDynamic>()
                .WhereIF(startTime != null, a => a.ContentTime >= startTime)
                .WhereIF(endTime != null, a => a.ContentTime <= endTime)
                .Where(a => companyNames.Contains(a.CompanyName))
                .WhereIF(eventType1.Contains("经营预警类") , a => a.EventType.StartsWith("深度信息-经营预警"))
                .WhereIF(eventType1.Contains("司法涉诉类"),
                    a => a.EventType.StartsWith("深度信息-司法涉诉"))//|| a.EventType == "深度信息-诉法涉诉-限制高消费"
                .WhereIF(eventType1.Contains("租赁融资类"), a => rateTypeArr.Contains(a.EventType))
                .WhereIF(eventType1 == "新闻类", a => newsTypeArr.Contains(a.EventType))
                .WhereIF(eventType1 == "公告类", a => anTypeArr.Contains(a.EventType))
                .Where(orWhere.ToExpression())
                .WhereIF(!string.IsNullOrWhiteSpace(eventType2), a => a.EventType.EndsWith(eventType2))
                .WhereIF(warnLevel != null, a => a.WarnLevel == warnLevel)
                .OrderBy(a => a.ContentTime, OrderByType.Desc)