202306181、新增设备管理（门禁、监控、环境监测）页面2、新增设备软件管理（门禁、监控、环境监测）页面3、优化费用管理模块。

2023-06-19 16:23:15 +08:00
parent 576de76520
commit c4302dfa9d
33 changed files with 3293 additions and 16 deletions
@@ -231,7 +231,7 @@ namespace FineUIPro.Web.HSSE.CostGoods

            var getCostManageItem = from x in Funs.DB.CostGoods_CostManageItem
                                    join y in Funs.DB.CostGoods_CostManage on x.CostManageId equals y.CostManageId
-                                    where y.ProjectId == this.ProjectId && (!year.HasValue || y.CostManageDate.Value.Year == year)
+                                    where y.ProjectId == this.ProjectId && (!year.HasValue || y.CostManageDate.Value.Year == year) && y.States == Const.State_2
                                    select new { x.CostManageId, x.CostManageItemId, y.UnitId, Year = y.CostManageDate.Value.Year, x.SupCostTypeId, x.CostTypeId, x.PriceMoney };

            var getType = (from x in getDetail select new { x.SupSortIndex, x.SortIndex, x.CostType }).Distinct();