diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index 66b343b..79bd2b0 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -2073,7 +2073,7 @@ namespace APT.SK.WebApi.Controllers.Api { var result = new T_SK_ENTERPRISE_LIBRARY(); var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID")?.Value.ToString(); - var mineType = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "MineType"); + var mineType = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PRODUCTION_UNIT_ID"); var areaId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "AREA_ID"); //var typeId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TYPE_ID"); var riskName = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "RISK_NAME"); @@ -2086,36 +2086,8 @@ namespace APT.SK.WebApi.Controllers.Api } else if (mineType != null && areaId != null && riskName != null)//&& typeId != null && riskDes!=null { - var temp = SKProductionUnit.All; - switch (mineType.Value.ToString()) - { - case "0": - temp = SKProductionUnit.All; - break; - case "10": - temp = SKProductionUnit.MineChoose; - break; - case "20": - temp = SKProductionUnit.Minelast; - break; - case "30": - temp = SKProductionUnit.Mine; - break; - case "40": - temp = SKProductionUnit.MineUnderGround; - break; - case "31": - temp = SKProductionUnit.Department; - break; - case "32": - temp = SKProductionUnit.Nonmetallic; - break; - default: - temp = SKProductionUnit.All; - break; - } - result = this.GetEntity(t => t.MineType == temp && t.AREA_ID == Guid.Parse(areaId.Value.ToString()) && t.RISK_NAME == riskName.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName", - "Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"}); + result = this.GetEntity(t => t.PRODUCTION_UNIT_ID == Guid.Parse(mineType.Value.ToString()) && t.AREA_ID == Guid.Parse(areaId.Value.ToString()) && t.RISK_NAME == riskName.Value.ToString(), new string[] { "Nav_Type", "Nav_Area","Nav_RiskName", + "Nav_SCOREL","Nav_SCOREE","Nav_SCOREC","Nav_ProductionUnit"}); } if (result != null) {