wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提报bug 巡检

Browse Source
This commit is contained in:
周科达
2024-08-27 10:15:51 +08:00
parent f90318a50d
commit a989fc13c5
3 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
View File

@@ -56,6 +56,7 @@ namespace Tnb.QcMgr.Entities
public string check_type { get; set; }
public string plan_check_type { get; set; }
public string batch { get; set; }
public string triggertype { get; set; } = "3";
}

10
QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
View File

@@ -504,7 +504,15 @@ namespace Tnb.QcMgr
RemarkAttribute remark = RemarkAttribute.GetRemark(enumTriggerEvent);
string type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id;
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == type && p.name == remark.CheckContent).First();
Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id) && a.checktype==entity.plan_check_type);
if (entity.triggertype == "3")
{
Query = Query.Where((a, b, c, d, e) => b.triggertype ==entity.triggertype && b.content!.Contains(TriggerEvent.id) && a.checktype==entity.plan_check_type);
}
else
{
Query = Query.Where((a, b, c, d, e) => b.triggertype ==entity.triggertype && a.checktype==entity.plan_check_type);
}
Query = Query.Where((a,b,c,d,e)=>!SqlFunc.IsNullOrEmpty(c.id) || !SqlFunc.IsNullOrEmpty(d.id) || !SqlFunc.IsNullOrEmpty(e.id));
}
private void Filter(List<QcCheckPlanH> QcCheckPlanHs, TriggerPlanEntity entity)
{