diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
index c8f54684..00f73cb9 100644
--- a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
+++ b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
@@ -3,10 +3,18 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using NPOI.SS.Formula.PTG;
namespace Tnb.QcMgr.Entities.Dto
{
- public class Trigger
+ public class TriggerPlan
{
+ public string id { get; set; }
+ public string name { get; set; }
+ public string code { get; set; }
+ public string type { get; set; }
+ public string cycle { get; set; }
+ public string[] trievent { get; set; }
+ public string[] trieventid { get; set; }
}
}
diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs
index bff66934..14102ccc 100644
--- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs
@@ -23,5 +23,13 @@ namespace Tnb.QcMgr.Interfaces
///
///
public Task GetCheckItems(string id);
+
+ ///
+ /// 获取触发计划清单
+ ///
+ ///
+ ///
+ public Task GetTriggerPlans();
+
}
}
diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
index e5fe01aa..1332a3ef 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
@@ -1,4 +1,5 @@
using System;
+using System.ArrayExtensions;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
@@ -108,6 +109,33 @@ namespace Tnb.QcMgr
return CheckPlansOut;
}
+ ///
+ /// 获取触发计划清单
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task GetTriggerPlans()
+ {
+ var db = _repository.AsSugarClient();
+ var QcTriggerPlans = await db.Queryable().ToListAsync();
+ var QcTriggerEvents = await db.Queryable().ToListAsync();
+ List TriggerPlans = new List();
+ foreach (var triggerPlan in QcTriggerPlans)
+ {
+ TriggerPlan TriggerPlan = new TriggerPlan();
+ TriggerPlan.id = triggerPlan.id;
+ TriggerPlan.name = triggerPlan.name!;
+ TriggerPlan.code = triggerPlan.code!;
+ TriggerPlan.type = triggerPlan.type!;
+ TriggerPlan.cycle = triggerPlan.cycle!;
+ TriggerPlan.trieventid = triggerPlan.trievent!.Replace("[", "").Replace("]", "").Replace("\r\n", "").Replace("\"", "").Replace(" ","").Split(',', StringSplitOptions.RemoveEmptyEntries);
+ TriggerPlan.trievent = QcTriggerEvents.Where(p => TriggerPlan.trieventid.Contains(p.id)).Select(p => p.name!).ToArray();
+ TriggerPlans.Add(TriggerPlan);
+ }
+ return TriggerPlans;
+ }
+
///
/// 保存质检方案质检项和附加信息
///